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

FIXED bug 0000248: Incorrect Heroism Jewelry set buffs.

Browse Source
This commit is contained in:
wallaceg09
2014-11-01 15:42:45 -05:00
parent c438ee3590
commit 0fb7aa97cb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@@ -30,6 +30,6 @@
<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
<classpathentry kind="lib" path="ngengine_public.jar"/>
<classpathentry kind="lib" path="lib/mbassador-1.1.9.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre8x64"/>
<classpathentry kind="output" path="bin"/>
</classpath>

9
src/services/equipment/EquipmentService.java
View File

@@ -109,8 +109,7 @@ public class EquipmentService implements INetworkDispatch {
func.__call__(Py.java2py(core), Py.java2py(actor), Py.java2py(item));
}
processItemAtrributes(actor, item, true);
if (replacedEquipment.size() > 0) {
actor.getEquipmentList().removeAll(replacedEquipment);
}
@@ -120,6 +119,8 @@ public class EquipmentService implements INetworkDispatch {
if (item instanceof WeaponObject) {
actor.setWeaponId(item.getObjectID());
}
processItemAtrributes(actor, item, true);//FIXME: If item bonuses stop working this might need to be moved back to the line before "actor.addObjectToEquipList(item);"
}
}
@@ -143,9 +144,9 @@ public class EquipmentService implements INetworkDispatch {
func.__call__(Py.java2py(core), Py.java2py(actor), Py.java2py(item));
}
processItemAtrributes(actor, item, false);
actor.removeObjectFromEquipList(item);
processItemAtrributes(actor, item, false);//FIXME: If item bonuses stop working this might need to be moved back to the line before "actor.removeObjectFromEquipList(item);"
}
}