From 4f054103df43ac697b0dacfbfcb74ff16a4c59b3 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sun, 29 Jan 2017 06:01:15 +0000 Subject: [PATCH] Added additional hasMaster checks before getMaster is called. --- .../game/script/item/texture_kit/texture_kit.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java diff --git a/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java b/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java old mode 100644 new mode 100755 index b0952b0a9..94ee45ea9 --- a/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java +++ b/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java @@ -33,11 +33,11 @@ public class texture_kit extends script.base_script return SCRIPT_CONTINUE; } obj_id target = getIntendedTarget(player); - if (!isIdValid(target) || (!pet_lib.isDroidPet(target) && getMaster(target) != player)) + if (!isIdValid(target) || (!pet_lib.isDroidPet(target) && pet_lib.hasMaster(target) && getMaster(target) != player)) { target = getLookAtTarget(player); } - if (pet_lib.isDroidPet(target) && getMaster(target) == player) + if (pet_lib.isDroidPet(target) && pet_lib.hasMaster(target) && getMaster(target) == player) { int mnuTexture = mi.addRootMenu(menu_info_types.ITEM_USE, MNU_TEXTURE); } @@ -53,11 +53,11 @@ public class texture_kit extends script.base_script return SCRIPT_CONTINUE; } obj_id target = getIntendedTarget(player); - if (!isIdValid(target) || (!pet_lib.isDroidPet(target) && getMaster(target) != player)) + if (!isIdValid(target) || (!pet_lib.isDroidPet(target) && pet_lib.hasMaster(target) && getMaster(target) != player)) { target = getLookAtTarget(player); } - if (pet_lib.isDroidPet(target) && getMaster(target) == player) + if (pet_lib.isDroidPet(target) && pet_lib.hasMaster(target) && getMaster(target) == player) { if (item == menu_info_types.ITEM_USE) {