From 0a1663e469dd6f1df0461aa39dffbb09b3c48932 Mon Sep 17 00:00:00 2001 From: Cekis Date: Fri, 3 Feb 2017 17:10:01 +0000 Subject: [PATCH] Avoided null pointer when attempting to add a trigger volume that does not exist for a player. --- .../compiled/game/script/systems/buff/buff_handler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/systems/buff/buff_handler.java diff --git a/sku.0/sys.server/compiled/game/script/systems/buff/buff_handler.java b/sku.0/sys.server/compiled/game/script/systems/buff/buff_handler.java old mode 100644 new mode 100755 index 7c901f949..98c87e7ef --- a/sku.0/sys.server/compiled/game/script/systems/buff/buff_handler.java +++ b/sku.0/sys.server/compiled/game/script/systems/buff/buff_handler.java @@ -2733,12 +2733,14 @@ public class buff_handler extends script.base_script continue; } messageTo(groupMembers[j], "setGroupBuffs", data, 0f, false); - addTriggerVolumeEventSource("group_buff_breach", groupMembers[j]); + if(hasTriggerVolume(self, "group_buff_breach")) + addTriggerVolumeEventSource("group_buff_breach", groupMembers[j]); } continue; } messageTo(addedMembers[i], "setGroupBuffs", data, 0f, false); - addTriggerVolumeEventSource("group_buff_breach", addedMembers[i]); + if(hasTriggerVolume(self, "group_buff_breach")) + addTriggerVolumeEventSource("group_buff_breach", addedMembers[i]); } } if (removedMembers != null && removedMembers.length > 0)