forked from MagicBane/Server
summon fix
This commit is contained in:
@@ -1298,8 +1298,7 @@ public enum PowersManager {
|
||||
if (pc == null)
|
||||
return;
|
||||
|
||||
PlayerCharacter target = SessionManager
|
||||
.getPlayerCharacterByLowerCaseName(msg.getTargetName());
|
||||
PlayerCharacter target = SessionManager.getPlayerCharacterByLowerCaseName(msg.getTargetName());
|
||||
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
|
||||
@@ -1309,7 +1308,7 @@ public enum PowersManager {
|
||||
ChatManager.chatInfoError(pc,
|
||||
"Cannot summon player in combat.");
|
||||
// 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,
|
||||
"Cannot summon outside of nation.");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user