projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-08-04 05:16:49 -04:00
Code Issues Projects Releases Wiki Activity

Fixed object movement and NGE-483

Browse Source
This commit is contained in:
Obique PSWG
2016-11-23 20:40:59 -06:00
parent 0e61e89cd2
commit 6926102009
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/awareness/AwarenessHandler.java
+6 -11
View File
@@ -38,8 +38,6 @@ import resources.server_info.Log;
public class AwarenessHandler {
private static final Location GONE_LOCATION = new Location(0, 0, 0, null);
private final Map<Terrain, TerrainMap> terrains;
public AwarenessHandler(TerrainMapCallback callback) {
@@ -78,20 +76,17 @@ public class AwarenessHandler {
if (area != null)
requestedLocation = area.adjustLocation(requestedLocation);
// Remove from previous awareness
Terrain oldTerrain = obj.getTerrain();
Terrain newTerrain = requestedLocation.getTerrain();
if (oldTerrain != newTerrain && oldTerrain != null) {
obj.clearObjectsAware(); // Moving to GONE
TerrainMap oldTerrainMap = getTerrainMap(oldTerrain);
if (obj.getTerrain() != requestedLocation.getTerrain()) {
TerrainMap oldTerrainMap = getTerrainMap(obj.getTerrain());
if (oldTerrainMap != null)
oldTerrainMap.removeFromMap(obj);
oldTerrainMap.removeWithoutUpdate(obj);
}
// Add to new awareness
TerrainMap map = getTerrainMap(newTerrain);
TerrainMap map = getTerrainMap(requestedLocation.getTerrain());
if (map != null) {
map.moveWithinMap(obj, requestedLocation);
} else if (!requestedLocation.equals(GONE_LOCATION)) {
Log.e(this, "Unknown terrain: %s", newTerrain);
} else {
Log.e(this, "Unknown terrain: %s", requestedLocation.getTerrain());
}
}