From 7ae25c9a1bbddfcdebe157bbab395e6db36ec572 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sun, 8 Sep 2024 18:21:16 -0500 Subject: [PATCH] can now summon in combat --- src/engine/gameManager/PowersManager.java | 2 +- src/engine/jobs/FinishSummonsJob.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index 9245f433..8470942b 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -1324,7 +1324,7 @@ public enum PowersManager { PlayerCharacter target = SessionManager .getPlayerCharacterByLowerCaseName(msg.getTargetName()); - if (target == null || target.equals(pc) || target.isCombat()) { + if (target == null || target.equals(pc)) { if (target == null) // Player not found. Send not found message ChatManager.chatInfoError(pc, diff --git a/src/engine/jobs/FinishSummonsJob.java b/src/engine/jobs/FinishSummonsJob.java index 0ee0fc68..77fb3de3 100644 --- a/src/engine/jobs/FinishSummonsJob.java +++ b/src/engine/jobs/FinishSummonsJob.java @@ -47,13 +47,13 @@ public class FinishSummonsJob extends AbstractScheduleJob { return; // cannot summon a player in combat - if (this.target.isCombat()) { + //if (this.target.isCombat()) { - ErrorPopupMsg.sendErrorMsg(this.source, "Cannot summon player in combat."); + // ErrorPopupMsg.sendErrorMsg(this.source, "Cannot summon player in combat."); - PowersManager.finishRecycleTime(428523680, this.source, false); - return; - } + // PowersManager.finishRecycleTime(428523680, this.source, false); + // return; + //} if (this.target.getBonuses() != null && this.target.getBonuses().getBool(ModType.BlockedPowerType, SourceType.SUMMON)) { ErrorPopupMsg.sendErrorMsg(this.target, "You have been blocked from receiving summons!");