From c2bc0b1c109029d1ccb3a5f1dc5c2ee157e83b7d Mon Sep 17 00:00:00 2001 From: Cekis Date: Thu, 29 Dec 2016 20:01:43 +0000 Subject: [PATCH] Removing PvP flags that were added when bounty is being collected and the target or hunter are killed and the bounty collection failed. --- .../compiled/game/script/library/bounty_hunter.java | 5 +++++ 1 file changed, 5 insertions(+) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/library/bounty_hunter.java diff --git a/sku.0/sys.server/compiled/game/script/library/bounty_hunter.java b/sku.0/sys.server/compiled/game/script/library/bounty_hunter.java old mode 100644 new mode 100755 index a54391989..e8fb824b9 --- a/sku.0/sys.server/compiled/game/script/library/bounty_hunter.java +++ b/sku.0/sys.server/compiled/game/script/library/bounty_hunter.java @@ -442,6 +442,11 @@ public class bounty_hunter extends script.base_script endMission(mission); } removeJediBounty(target, hunter); + // remove TEFs that were set when players engaged in battle + if(isPlayer(hunter) && isPlayer(target)) { + if (pvpHasPersonalEnemyFlag(target, hunter)) pvpRemovePersonalEnemyFlags(target, hunter); + if (pvpHasPersonalEnemyFlag(hunter, target)) pvpRemovePersonalEnemyFlags(hunter, target); + } CustomerServiceLog("bounty", "%TU was defeated by %TT and failed to collect the bounty on %PT head", hunter, target); } public static obj_id getBountyMission(obj_id player) throws InterruptedException