From 6c04023df47dde4d0c73dcbadc79d62bee7f4f7e Mon Sep 17 00:00:00 2001 From: Cekis Date: Fri, 20 Jan 2017 19:54:48 +0000 Subject: [PATCH] Fixed issue where attacker was attempting to reset hate on a non-tangible object. --- sku.0/sys.server/compiled/game/script/library/combat.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/combat.java b/sku.0/sys.server/compiled/game/script/library/combat.java index b37eb8116..a7b460b12 100755 --- a/sku.0/sys.server/compiled/game/script/library/combat.java +++ b/sku.0/sys.server/compiled/game/script/library/combat.java @@ -1747,11 +1747,11 @@ public class combat extends script.base_script addHate(attacker, defender, 0.0f); { - final obj_id[] hateList = getHateList(attacker); + obj_id[] hateList = getHateList(attacker); for (int i = 0; i < hateList.length; ++i) { - final obj_id hateTarget = hateList[i]; - if (!isPlayer(hateTarget)) + obj_id hateTarget = hateList[i]; + if (!isPlayer(hateTarget) && isTangible(hateTarget)) { if (getHateTarget(hateTarget) == attacker) {