|
|
@ -1300,7 +1300,7 @@ public enum PowersManager { |
|
|
|
|
|
|
|
|
|
|
|
PlayerCharacter target = SessionManager |
|
|
|
PlayerCharacter target = SessionManager |
|
|
|
.getPlayerCharacterByLowerCaseName(msg.getTargetName()); |
|
|
|
.getPlayerCharacterByLowerCaseName(msg.getTargetName()); |
|
|
|
if (target == null || target.equals(pc) || target.isCombat()) { |
|
|
|
if (target == null || target.equals(pc) || target.isCombat() || target.getGuild().getNation().equals(pc.getGuild().getNation()) == false) { |
|
|
|
|
|
|
|
|
|
|
|
if (target == null) // Player not found. Send not found message
|
|
|
|
if (target == null) // Player not found. Send not found message
|
|
|
|
ChatManager.chatInfoError(pc, |
|
|
|
ChatManager.chatInfoError(pc, |
|
|
@ -1309,7 +1309,10 @@ public enum PowersManager { |
|
|
|
ChatManager.chatInfoError(pc, |
|
|
|
ChatManager.chatInfoError(pc, |
|
|
|
"Cannot summon player in combat."); |
|
|
|
"Cannot summon player in combat."); |
|
|
|
// else trying to summon self, just fail
|
|
|
|
// else trying to summon self, just fail
|
|
|
|
|
|
|
|
if(target.getGuild().getNation().equals(pc.getGuild().getNation()) == false){ |
|
|
|
|
|
|
|
ChatManager.chatInfoError(pc, |
|
|
|
|
|
|
|
"Cannot summon outside of nation."); |
|
|
|
|
|
|
|
} |
|
|
|
// recycle summon
|
|
|
|
// recycle summon
|
|
|
|
sendRecyclePower(msg.getPowerToken(), origin); |
|
|
|
sendRecyclePower(msg.getPowerToken(), origin); |
|
|
|
|
|
|
|
|
|
|
|