浏览代码

fixes #3362 npe, thanks cool_santino for pointing it out

Sami 16 年之前
父节点
当前提交
6add958618
共有 1 个文件被更改,包括 7 次插入8 次删除
  1. 7 8
      L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2TrapInstance.java

+ 7 - 8
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2TrapInstance.java

@@ -185,7 +185,11 @@ public class L2TrapInstance extends L2Trap
 		}
 		unSummon(getOwner());
 		
-		for (L2Object atked : _skill.getTargetList(this))
+		L2Object[] targetList = _skill.getTargetList(this);
+		if (targetList == null) 
+			return;
+		
+		for (L2Object atked : targetList)
 		{
 			if (atked == getOwner())
 				continue;
@@ -193,13 +197,8 @@ public class L2TrapInstance extends L2Trap
 			if (atked instanceof L2PcInstance)
 				continue;
 			
-			else if (atked != null)
-			{
-				if (atked instanceof L2Attackable)
-				{
-					((L2Attackable)atked).addDamage(getOwner(), 1);
-				}
-			}
+			if (atked instanceof L2Attackable)
+				((L2Attackable)atked).addDamage(getOwner(), 1);
 		}
 	}