projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-12 22:45:31 -04:00
Code Issues Projects Releases Wiki Activity

Update ObjectService.java

Browse Source
This commit is contained in:
Undercova
2014-10-28 16:06:26 +01:00
parent a32ba0444f
commit b64acae587
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+22 -26
View File
@@ -784,32 +784,27 @@ public class ObjectService implements INetworkDispatch {
object.viewChildren(object, true, true, (child) -> loadServerTemplate(child));
object.viewChildren(object, true, true, (child) -> instantiateChild(child));
}
/* Diagnostic part */
// System.out.println("Creo : " + object.getCustomName());
// System.out.println("Creo ID : " + object.getObjectID());
// System.out.println("Equipment List : " + object.getEquipmentList().size());
/* Diagnostic part */
SWGList<Equipment> eqList = object.getEquipmentList();
List<Equipment> delList = new ArrayList<Equipment>();
for (Equipment eq :eqList){
// System.out.println("Equipment getObjectID() " + eq.getObjectId());
// System.out.println("Equipment Class " + eq.getObject().getClass()); -> NPE
// System.out.println("Equipment Name " + eq.getObject().getCustomName()); -> NPE
// System.out.println("Equipment Template " + eq.getObject().getTemplate()); -> NPE
/* Diagnostic part */
// System.out.println("Creo : " + object.getCustomName());
// System.out.println("Creo ID : " + object.getObjectID());
// System.out.println("Equipment List : " + object.getEquipmentList().size());
/* Diagnostic part */
if(! checkIfObjectAlreadyInList(eq.getObjectId()))
delList.add(eq);
}
eqList.removeAll(delList); // The persisted equipment list contains objects that do not exist anymore, merely a hotfix really
object.getEquipmentList().clear();
object.getEquipmentList().addAll(eqList);
SWGList<Equipment> eqList = object.getEquipmentList();
List<Equipment> delList = new ArrayList<Equipment>();
for (Equipment eq : eqList){
// System.out.println("Equipment getObjectID() " + eq.getObjectId());
// System.out.println("Equipment Class " + eq.getObject().getClass()); -> NPE
// System.out.println("Equipment Name " + eq.getObject().getCustomName()); -> NPE
// System.out.println("Equipment Template " + eq.getObject().getTemplate()); -> NPE
return (CreatureObject) object;
if (!checkIfObjectAlreadyInList(eq.getObjectId()))
delList.add(eq);
}
eqList.removeAll(delList); // The persisted equipment list contains objects that do not exist anymore, merely a hotfix really
}
return object;
}
public void instantiateChild(SWGObject child) {
@@ -1763,8 +1758,9 @@ public class ObjectService implements INetworkDispatch {
synchronized(persistentBuildings) {
for(BuildingObject building : persistentBuildings) {
building.setAttachment("buildoutBuilding", true);
core.getSWGObjectODB().put(building.getObjectID(), building);
destroyObject(building);
core.simulationService.add(building, building.getPosition().x, building.getPosition().z);
//core.getSWGObjectODB().put(building.getObjectID(), building);
//destroyObject(building);
}
}
}