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

Fixed various bugs regarding the recent refactor

Browse Source
This commit is contained in:
Obique PSWG
2017-04-28 16:45:48 -05:00
parent 90ece6bb32
commit c3996b6d06
35 changed files with 368 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+2 -2
View File
@@ -271,7 +271,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
private void handleDataTransform(DataTransform dt, ObjectManager objectManager) {
SWGObject obj = objectManager.getObjectById(dt.getObjectId());
Assert.test(obj instanceof CreatureObject);
Assert.test(obj instanceof CreatureObject, "DataTransform object not CreatureObject! Was: " + (obj==null?"null":obj.getClass()));
Location requestedLocation = new Location(dt.getLocation());
requestedLocation.setTerrain(obj.getTerrain());
moveObjectWithTransform(obj, null, requestedLocation, dt.getSpeed(), dt.getUpdateCounter());
@@ -280,7 +280,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
private void handleDataTransformWithParent(DataTransformWithParent dt, ObjectManager objectManager) {
SWGObject obj = objectManager.getObjectById(dt.getObjectId());
SWGObject parent = objectManager.getObjectById(dt.getCellId());
Assert.test(obj instanceof CreatureObject);
Assert.test(obj instanceof CreatureObject, "DataTransformWithParent object not CreatureObject! Was: " + (obj==null?"null":obj.getClass()));
if (parent == null) {
Log.w("Unknown data transform parent! Obj: %d/%s Parent: %d", dt.getObjectId(), obj, dt.getCellId());
return;