From ed7e7be3e878b3f94a08e5f1b704c156e3e16fd5 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Wed, 10 Apr 2024 19:05:55 -0500 Subject: [PATCH] extra summon time doesnt affect safezones --- src/engine/gameManager/PowersManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index 44f3fa05..c73711fa 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -1400,16 +1400,16 @@ public enum PowersManager { duration = 15000; // Healer Summons, 15 seconds else duration = 45000; // Belgosh Summons, 45 seconds - - for(AbstractWorldObject absChar : WorldGrid.getObjectsInRangePartial(pc.loc,MBServerStatics.CHARACTER_LOAD_RANGE,MBServerStatics.MASK_PLAYER)){ - PlayerCharacter player = (PlayerCharacter)absChar; - if(player.guild.getNation().equals(pc.guild.getNation()) == false){ - duration += 60000; - break; + if(pc.inSafeZone() == false) { + for (AbstractWorldObject absChar : WorldGrid.getObjectsInRangePartial(pc.loc, MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER)) { + PlayerCharacter player = (PlayerCharacter) absChar; + if (player.guild.getNation().equals(pc.guild.getNation()) == false) { + duration += 60000; + break; + } } } - // Teleport to summoners location FinishSummonsJob fsj = new FinishSummonsJob(source, pc); JobContainer jc = JobScheduler.getInstance().scheduleJob(fsj,