Browse Source

can now summon in combat

lakebane-strongholds
FatBoy-DOTC 4 months ago
parent
commit
7ae25c9a1b
  1. 2
      src/engine/gameManager/PowersManager.java
  2. 10
      src/engine/jobs/FinishSummonsJob.java

2
src/engine/gameManager/PowersManager.java

@ -1324,7 +1324,7 @@ public enum PowersManager { @@ -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,

10
src/engine/jobs/FinishSummonsJob.java

@ -47,13 +47,13 @@ public class FinishSummonsJob extends AbstractScheduleJob { @@ -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!");

Loading…
Cancel
Save