projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from ProjectSWGCore/master

Browse Source 
Fixed a potential issue with equipping.
This commit is contained in:
Zing
2014-09-07 13:47:53 -07:00
parent e0ebd7c509 c45a04c286
commit 1a5743c2ae
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/equipment/EquipmentService.java
+9 -4
View File
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.TreeMap;
import java.util.Vector;
import org.python.core.Py;
import org.python.core.PyObject;
@@ -64,8 +65,10 @@ public class EquipmentService implements INetworkDispatch {
SWGObject container = actor;
if (canWear(actor, container, item)) {
for (String slotName : container.getSlotNamesForObject(item)) {
if (container.getSlottedObject(slotName) != null && !container.getSlotNamesForObject(item).iterator().hasNext()) {
Vector<String> slotNames = container.getSlotNamesForObject(item);
for (String slotName : slotNames) {
if (container.getSlottedObject(slotName) != null && !slotNames.iterator().hasNext()) {
container.transferTo(actor, actor.getSlottedObject("inventory"), container.getSlottedObject(slotName));
break;
}
@@ -113,8 +116,10 @@ public class EquipmentService implements INetworkDispatch {
SWGObject container = actor.getSlottedObject("appearance_inventory");
if (canWear(actor, container, item)) {
for (String slotName : container.getSlotNamesForObject(item)) {
if (container.getSlottedObject(slotName) != null && !container.getSlotNamesForObject(item).iterator().hasNext()) {
Vector<String> slotNames = container.getSlotNamesForObject(item);
for (String slotName : slotNames) {
if (container.getSlottedObject(slotName) != null && !slotNames.iterator().hasNext()) {
unequipAppearance(actor, container.getSlottedObject(slotName));
container.transferTo(actor, actor.getSlottedObject("inventory"), container.getSlottedObject(slotName));
break;