|
|
|
@ -177,10 +177,10 @@ public enum PowersManager {
@@ -177,10 +177,10 @@ public enum PowersManager {
|
|
|
|
|
PlayerCharacter caster = origin.getPlayerCharacter(); |
|
|
|
|
PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID()); |
|
|
|
|
if (pb != null && pb.isHarmful == false) { |
|
|
|
|
if (caster.guild.equals(Guild.getErrantGuild())) |
|
|
|
|
return; |
|
|
|
|
//if (caster.guild.equals(Guild.getErrantGuild()))
|
|
|
|
|
// return;
|
|
|
|
|
|
|
|
|
|
if (target != null && caster.guild.getGuildType().equals(target.guild.getGuildType()) == false) |
|
|
|
|
if (target != null && caster.guild.getGuildType().equals(target.guild.getGuildType()) == false && target.getObjectType().equals(GameObjectType.Building) == false) |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|