_DS_ пре 16 година
родитељ
комит
329f30def1

+ 7 - 4
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeFlagInstance.java

@@ -54,7 +54,7 @@ public class L2SiegeFlagInstance extends L2Npc
 		}
 		else
 		{
-			L2SiegeClan sc = _siege.getAttackerClan(_player.getClan());
+			L2SiegeClan sc = _siege.getAttackerClan(_clan);
 			if (sc == null)
 				deleteMe();
 			else
@@ -91,9 +91,12 @@ public class L2SiegeFlagInstance extends L2Npc
     {
     	if (!super.doDie(killer))
     		return false;
-    	L2SiegeClan sc = _siege.getAttackerClan(_player.getClan());
-        if (sc != null)
-        	sc.removeFlag(this);
+    	if (_siege != null && _clan != null)
+    	{
+        	L2SiegeClan sc = _siege.getAttackerClan(_clan);
+            if (sc != null)
+            	sc.removeFlag(this);
+    	}
         return true;
     }