From f9b7c8b851948e3a446125c764055ab3137b9938 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Wed, 1 Jan 2025 20:37:13 -0600 Subject: [PATCH] Arena System --- src/engine/gameManager/ArenaManager.java | 6 +----- src/engine/objects/PlayerCharacter.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/engine/gameManager/ArenaManager.java b/src/engine/gameManager/ArenaManager.java index 321c801b..c2d77839 100644 --- a/src/engine/gameManager/ArenaManager.java +++ b/src/engine/gameManager/ArenaManager.java @@ -78,7 +78,7 @@ public class ArenaManager { } } - public static void endArena(Arena arena, PlayerCharacter winner, PlayerCharacter loser, String condition) throws MsgSendException { + public static void endArena(Arena arena, PlayerCharacter winner, PlayerCharacter loser, String condition){ if (winner != null && loser != null) { Logger.info("[ARENA] The fight between {} and {} is concluded. Victor: {}", arena.player1.getName(), arena.player2.getName(), winner.getName()); @@ -86,10 +86,6 @@ public class ArenaManager { Logger.info("[ARENA] The fight between {} and {} is concluded. No Winner Declared.", arena.player1.getName(), arena.player2.getName()); } - if(loser != null) { - PlayerCharacter.forceRespawn(loser); - loser.removeEffectBySource(Enum.EffectSourceType.DeathShroud,41,false); - } // Teleport players to the arena location Zone sdr = ZoneManager.getZoneByUUID(656); MovementManager.translocate(arena.player1, Vector3fImmutable.getRandomPointOnCircle(sdr.getLoc(),50f), null); diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 89eabc37..36162ef9 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -4825,7 +4825,7 @@ public class PlayerCharacter extends AbstractCharacter { return false; } - public static void forceRespawn(PlayerCharacter sourcePlayer) throws MsgSendException { + private static void forceRespawn(PlayerCharacter sourcePlayer) throws MsgSendException { if (sourcePlayer == null) return;