MagicBane/Server
Template
434
1
Fork 5
Code Issues 8 Pull Requests Projects Releases Wiki Activity

summon fix

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-04-20 10:49:52 -05:00
parent 1f7ea89d66
commit e2cca6201f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/PowersManager.java
+2 -3
View File
@@ -1298,8 +1298,7 @@ public enum PowersManager {
if (pc == null) if (pc == null)
return; return;
PlayerCharacter target = SessionManager PlayerCharacter target = SessionManager.getPlayerCharacterByLowerCaseName(msg.getTargetName());
.getPlayerCharacterByLowerCaseName(msg.getTargetName());
if (target == null || target.equals(pc) || target.isCombat() || target.getGuild().getNation().equals(pc.getGuild().getNation()) == false) { 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
@@ -1309,7 +1308,7 @@ 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){ if(target != null && target.getGuild().getNation().equals(pc.getGuild().getNation()) == false){
ChatManager.chatInfoError(pc, ChatManager.chatInfoError(pc,
"Cannot summon outside of nation."); "Cannot summon outside of nation.");
} }