Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Logic cleanup

Browse Source
This commit is contained in:
MagicBot
2024-03-11 01:01:51 -04:00
parent 15d2f2b9d8
commit 784767dc4e
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/ItemTemplate.java
+12 -11
View File
@@ -530,23 +530,24 @@ public class ItemTemplate {
if (itemManager == null || abstractCharacter == null) if (itemManager == null || abstractCharacter == null)
return false; return false;
if (abstractCharacter.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) { // Early exit for mobiles and NPCS.
// Perhaps not needed now that mobs have skills.
if (!validForSlot(slot, itemManager.getEquipped(), item)) if (EnumSet.of(Enum.GameObjectType.NPC, Enum.GameObjectType.Mob).contains(abstractCharacter.getObjectType()))
return false; return false;
if (!validForSkills(item, abstractCharacter.getSkills())) if (!validForSlot(slot, itemManager.getEquipped(), item))
return false; return false;
if (canCharacterEquip(item, abstractCharacter) == false) if (!validForSkills(item, abstractCharacter.getSkills()))
return false; return false;
//players can't wear 0 value items. if (canCharacterEquip(item, abstractCharacter) == false)
return false;
return item.template.item_value != 0 || Kit.IsNoobGear(item.getItemBase().uuid); //players can't wear 0 value items.
} return item.template.item_value != 0 || Kit.IsNoobGear(item.getItemBase().uuid);
return true; //Mobiles and NPC's don't need to check equip
} }
} }