瀏覽代碼

BETA: Deadlock fix thanks Deedlit and jurchicks

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

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

@@ -4264,7 +4264,7 @@ public abstract class L2Character extends L2Object
 	 */
 	 */
 	public boolean isInCombat()
 	public boolean isInCombat()
 	{
 	{
-		return (getAI().getAttackTarget() != null || getAI().isAutoAttacking());
+		return hasAI() && (getAI().getAttackTarget() != null || getAI().isAutoAttacking());
 	}
 	}
 	
 	
 	/**
 	/**