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

Equipment list now uses ids instead of the referencing the object to avoid storing duplicate objects in the db

Browse Source
This commit is contained in:
Light2
2014-05-04 20:54:41 +02:00
parent 3c3155b8b2
commit db4a47b35a
8 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureMessageBuilder.java
+18 -2
View File
@@ -24,6 +24,8 @@ package resources.objects.creature;
import java.nio.ByteOrder;
import java.util.Map.Entry;
import main.NGECore;
import org.apache.mina.core.buffer.IoBuffer;
import com.sleepycat.persist.model.Persistent;
@@ -304,7 +306,14 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
buffer.putInt(creature.getEquipmentList().size());
buffer.putInt(creature.getEquipmentListUpdateCounter());
for(SWGObject obj : creature.getEquipmentList().get()) {
for(Long objId : creature.getEquipmentList().get()) {
SWGObject obj = NGECore.getInstance().objectService.getObject(objId);
if(obj == null) {
System.err.println("Cant find obj for obj id in equip list!!!");
continue;
}
if(obj instanceof TangibleObject && !(obj instanceof WeaponObject)) {
TangibleObject tangible = (TangibleObject) obj;
@@ -409,7 +418,14 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
buffer.putInt(creature.getAppearanceEquipmentList().size());
buffer.putInt(creature.getAppearanceEquipmentListUpdateCounter());
for(SWGObject obj : creature.getAppearanceEquipmentList().get()) {
for(Long objId : creature.getAppearanceEquipmentList().get()) {
SWGObject obj = NGECore.getInstance().objectService.getObject(objId);
if(obj == null) {
System.err.println("Cant find obj for obj id in equip list!!!");
continue;
}
if(obj instanceof TangibleObject) {
TangibleObject tangible = (TangibleObject) obj;