projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-10 00:13:05 -04:00
Code Issues Projects Releases Wiki Activity

Fixed some syntax errors

Browse Source
This commit is contained in:
Treeku
2014-09-08 22:16:29 +01:00
parent 8d8a4d78f4
commit 95d0ce89e9
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/equipment/EquipmentService.java
+20 -4
View File
@@ -63,6 +63,7 @@ public class EquipmentService implements INetworkDispatch {
public void equip(CreatureObject actor, SWGObject item) {
SWGObject container = actor;
SWGObject oldContainer = item.getContainer();
if (canWear(actor, container, item)) {
List<Equipment> replacedEquipment = new ArrayList<Equipment>();
@@ -74,7 +75,11 @@ public class EquipmentService implements INetworkDispatch {
}
}
container.transferTo(actor, container, item);
if (oldContainer == null) {
container.add(item);
} else {
oldContainer.transferTo(actor, container, item);
}
for (SWGObject replacedItem : replacedEquipment) {
if (actor.isWearing(replacedItem)) {
@@ -117,12 +122,15 @@ public class EquipmentService implements INetworkDispatch {
}
public void unequip(CreatureObject actor, SWGObject item) {
SWGObject container = actor.getSlottedObject("inventory");
SWGObject oldContainer = item.getContainer();
if (actor.isWearing(item)) {
if (item instanceof WeaponObject) {
actor.setWeaponId(actor.getSlottedObject("default_weapon").getObjectID());
}
container.transferTo(actor, actor.getSlottedObject("inventory"), item);
oldContainer.transferTo(actor, container, item);
String template = ((item.getAttachment("customServerTemplate") == null) ? item.getTemplate() : (item.getTemplate().split("shared_")[0] + "shared_" + ((String) item.getAttachment("customServerTemplate")) + ".iff"));
String serverTemplate = template.replace(".iff", "");
@@ -141,6 +149,7 @@ public class EquipmentService implements INetworkDispatch {
public void equipAppearance(CreatureObject actor, SWGObject item) {
SWGObject container = actor.getSlottedObject("appearance_inventory");
SWGObject oldContainer = item.getContainer();
if (canWear(actor, container, item)) {
for (String slotName : container.getSlotNamesForObject(item)) {
@@ -149,15 +158,22 @@ public class EquipmentService implements INetworkDispatch {
}
}
container.transferTo(actor, container, item);
if (oldContainer == null) {
container.add(item);
} else {
container.transferTo(actor, container, item);
}
actor.addObjectToAppearanceEquipList(item);
}
}
public void unequipAppearance(CreatureObject actor, SWGObject item) {
SWGObject container = actor.getSlottedObject("inventory");
SWGObject oldContainer = item.getContainer();
if (actor.isWearingAppearance(item)) {
container.transferTo(actor, actor.getSlottedObject("inventory"), item);
oldContainer.transferTo(actor, container, item);
actor.removeObjectFromAppearanceEquipList(item);
}