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

Fixed null pointer in ObjectAwareness for buildout areas

Browse Source
This commit is contained in:
Obique PSWG
2016-03-06 12:13:44 -06:00
parent 46cd3c2e75
commit f5792f7a25
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+6 -2
View File
@@ -198,10 +198,14 @@ public class ObjectAwareness extends Service {
transform.setSpeed((float) (obj.getMovementScale()*7.3));
}
BuildoutArea area = obj.getBuildoutArea();
area.adjustLocation(newLocation);
if (area == null)
System.err.println("Unknown buildout area at: " + obj.getWorldLocation());
else
newLocation = area.adjustLocation(newLocation);
new PlayerTransformedIntent(obj, obj.getParent(), null, obj.getLocation(), newLocation).broadcast();
move(obj, newLocation, true);
area.readjustLocation(newLocation);
if (area != null)
newLocation = area.readjustLocation(newLocation);
obj.sendDataTransforms(transform);
}