projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-07-31 01:15:50 -04:00
Code Issues Projects Releases Wiki Activity

Owner is now set for PlayerObject, Moved requestWaypointAtPosition to java, Updated SWGMap constructors,

Browse Source
This commit is contained in:
Waverunner
2015-02-06 08:45:15 -05:00
parent abc0bdde8d
commit 46d188718d
10 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+4 -1
View File
@@ -32,6 +32,7 @@ import resources.control.Manager;
import resources.objects.SWGObject;
import resources.objects.creature.CreatureObject;
import resources.objects.quadtree.QuadTree;
import resources.objects.waypoint.WaypointObject;
import resources.player.Player;
import resources.player.PlayerEvent;
import resources.player.PlayerState;
@@ -195,7 +196,7 @@ public class ObjectManager extends Manager {
}
private void addToQuadTree(SWGObject obj) {
if (obj == null)
if (obj == null || obj instanceof WaypointObject)
return;
Location loc = obj.getLocation();
if (loc == null || loc.getTerrain() == null)
@@ -320,6 +321,8 @@ public class ObjectManager extends Manager {
if (player.getPlayerObject() == null) {
System.err.println("FATAL: " + player.getUsername() + "'s CreatureObject has a null ghost!");
}
player.getPlayerObject().setOwner(player);
}
private long getNextObjectId() {