From fd0845505b44bc85979c54bda2b52b073cd0fbe9 Mon Sep 17 00:00:00 2001 From: Treeku Date: Fri, 28 Mar 2014 02:19:16 +0000 Subject: [PATCH] Check for permanent equipment in resetLevel --- src/services/PlayerService.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index 92f8c32b..a0b8be9f 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -530,6 +530,24 @@ public class PlayerService implements INetworkDispatch { PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost"); for (SWGObject equipment : creature.getEquipmentList()) { + if (equipment == null) { + continue; + } + + switch (equipment.getTemplate()) { + case "object/tangible/inventory/shared_character_inventory.iff": + case "object/tangible/inventory/shared_appearance_inventory.iff": + case "object/tangible/datapad/shared_character_datapad.iff": + case "object/tangible/bank/shared_character_bank.iff": + case "object/tangible/mission_bag/shared_mission_bag.iff": + case "object/weapon/creature/shared_creature_default_weapon.iff": { + continue; + } + default: { + // + } + } + core.equipmentService.unequip(creature, equipment); }