From c6db149625766f7984150910bcbd420790f54dfe Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Wed, 26 Mar 2025 14:51:17 -0500 Subject: [PATCH] adjust arena size --- src/engine/gameManager/ArenaManager.java | 4 +++- src/engine/objects/Arena.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/engine/gameManager/ArenaManager.java b/src/engine/gameManager/ArenaManager.java index e8a3ffbb..136bc188 100644 --- a/src/engine/gameManager/ArenaManager.java +++ b/src/engine/gameManager/ArenaManager.java @@ -18,6 +18,8 @@ public class ArenaManager { public static Long pulseDelay = 180000L; public static Long lastExecution = 0L; + public static float arena_radius = 500f; + public static void pulseArenas() { if(lastExecution == 0L){ lastExecution = System.currentTimeMillis(); @@ -132,7 +134,7 @@ public class ArenaManager { float y = 0; // Y coordinate is always 0 loc = new Vector3fImmutable(x, y, z * -1); - HashSet inRange = WorldGrid.getObjectsInRangePartial(loc,500f, MBServerStatics.MASK_PLAYER); + HashSet inRange = WorldGrid.getObjectsInRangePartial(loc,arena_radius, MBServerStatics.MASK_PLAYER); if(inRange.isEmpty() && !isUnderWater(loc)) locSet = true; //} diff --git a/src/engine/objects/Arena.java b/src/engine/objects/Arena.java index c6bde540..05935611 100644 --- a/src/engine/objects/Arena.java +++ b/src/engine/objects/Arena.java @@ -19,8 +19,8 @@ public class Arena { } public Boolean disqualify() { - HashSet inRange = WorldGrid.getObjectsInRangePartial(this.loc, 250f, MBServerStatics.MASK_PLAYER); - HashSet warningRange = WorldGrid.getObjectsInRangePartial(this.loc, 500f, MBServerStatics.MASK_PLAYER); + HashSet inRange = WorldGrid.getObjectsInRangePartial(this.loc, ArenaManager.arena_radius, MBServerStatics.MASK_PLAYER); + HashSet warningRange = WorldGrid.getObjectsInRangePartial(this.loc, ArenaManager.arena_radius + 250f, MBServerStatics.MASK_PLAYER); for(AbstractWorldObject obj : warningRange){ PlayerCharacter pc = (PlayerCharacter)obj; if(pc.equals(this.player1) || pc.equals(this.player2))