Sync with L2jServer HighFive Mar 1st 2015.

2015-03-01 22:48:14 +00:00
parent f14af24b41
commit 6fa0ed56e3
116 changed files with 971 additions and 676 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanResurrect.java
+++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanResurrect.java
@ -47,6 +47,10 @@ public class ConditionPlayerCanResurrect extends Condition
 		{
 			return true;
 		}
+		if (effected == null)
+		{
+			return false;
+		}
 		boolean canResurrect = true;
 		
 		if (effected.isPlayer())