swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-07-31 00:15:54 -04:00
Code Issues Projects Releases Wiki Activity

Added additional hasMaster checks before getMaster is called.

Browse Source
This commit is contained in:
Cekis
2018-03-23 16:00:53 -07:00
committed by CekisSWG
parent 33cbb4787a
commit 4f054103df
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java
Regular → Executable
+4 -4
View File
@@ -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)
{