瀏覽代碼

Preveinting NPCs from hating themselves

Reported by: Cresceus, @Zoey76, @Adry85
Patch by: Zephyr (@luksdlt92)
Zoey76 10 年之前
父節點
當前提交
7fc99763cb
共有 1 個文件被更改,包括 8 次插入4 次删除
  1. 8 4
      L2J_Server/java/com/l2jserver/gameserver/model/actor/L2Character.java

+ 8 - 4
L2J_Server/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -5961,14 +5961,18 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				}
 			}
 			// Notify AI
-			if (skill.isBad() && !skill.hasEffectType(L2EffectType.HATE))
+			if (skill.isBad() && (skill.getTargetType() != L2TargetType.SELF) && !skill.hasEffectType(L2EffectType.HATE))
 			{
 				for (L2Object target : targets)
 				{
-					if ((target instanceof L2Character) && ((L2Character) target).hasAI())
+					if (target instanceof L2Character)
 					{
-						// notify target AI about the attack
-						((L2Character) target).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+						final L2Character creature = (L2Character) target;
+						if (creature.hasAI())
+						{
+							// notify target AI about the attack
+							creature.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+						}
 					}
 				}
 			}