MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Arena System

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-01 20:37:13 -06:00
parent b3cf72abdc
commit f9b7c8b851
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/ArenaManager.java
+1 -5
View File
@@ -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) { if (winner != null && loser != null) {
Logger.info("[ARENA] The fight between {} and {} is concluded. Victor: {}", Logger.info("[ARENA] The fight between {} and {} is concluded. Victor: {}",
arena.player1.getName(), arena.player2.getName(), winner.getName()); 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.", Logger.info("[ARENA] The fight between {} and {} is concluded. No Winner Declared.",
arena.player1.getName(), arena.player2.getName()); 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 // Teleport players to the arena location
Zone sdr = ZoneManager.getZoneByUUID(656); Zone sdr = ZoneManager.getZoneByUUID(656);
MovementManager.translocate(arena.player1, Vector3fImmutable.getRandomPointOnCircle(sdr.getLoc(),50f), null); MovementManager.translocate(arena.player1, Vector3fImmutable.getRandomPointOnCircle(sdr.getLoc(),50f), null);
src/engine/objects/PlayerCharacter.java
+1 -1
View File
@@ -4825,7 +4825,7 @@ public class PlayerCharacter extends AbstractCharacter {
return false; return false;
} }
public static void forceRespawn(PlayerCharacter sourcePlayer) throws MsgSendException { private static void forceRespawn(PlayerCharacter sourcePlayer) throws MsgSendException {
if (sourcePlayer == null) if (sourcePlayer == null)
return; return;