瀏覽代碼

BETA: NullPointerException fix, thanks tukune for report.

Zoey76 13 年之前
父節點
當前提交
2deb78a2dd
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

+ 8 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2302,13 +2302,18 @@ public abstract class L2Character extends L2Object
 				return false;
 			}
 		}
-		for (DeathListener listener : killer.getDeathListeners())
+		
+		if (killer != null)
 		{
-			if (!listener.onKill(this, killer))
+			for (DeathListener listener : killer.getDeathListeners())
 			{
-				return false;
+				if (!listener.onKill(this, killer))
+				{
+					return false;
+				}
 			}
 		}
+		
 		for (DeathListener listener : globalDeathListeners)
 		{
 			if (killer instanceof L2PcInstance || this instanceof L2PcInstance)