Sync with L2jServer HighFive Nov 14th 2015.

2015-11-14 16:31:37 +00:00
parent 887fbcc6b5
commit e38353e409
125 changed files with 1998 additions and 1419 deletions
--- a/trunk/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java
+++ b/trunk/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java
@@ -147,11 +147,11 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 		if ((target != null) && target.isInvul())
 		{
 			// However EffectInvincible requires to check GMs specially
-			if ((target instanceof L2PcInstance) && target.isGM())
+			if (target.isPlayer() && target.isGM())
 			{
 				return false;
 			}
-			if ((target instanceof L2Summon) && ((L2Summon) target).getOwner().isGM())
+			if (target.isSummon() && ((L2Summon) target).getOwner().isGM())
 			{
 				return false;
 			}