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

Refactored character creation

Browse Source
This commit is contained in:
Obique PSWG
2016-12-31 12:37:02 -06:00
parent 0530a5dcbc
commit b87e06331d
5 changed files with 251 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+11 -7
View File
@@ -186,10 +186,12 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
private void handleObjectCreatedIntent(ObjectCreatedIntent oci) {
SWGObject object = oci.getObject();
if (object.getParent() == null)
moveObject(object, object.getLocation());
else
if (object.getParent() == null) {
if (object.getTerrain() != null)
moveObject(object, object.getLocation());
} else {
moveObject(object, object.getParent(), object.getLocation());
}
}
private void handleDestroyObjectIntent(DestroyObjectIntent doi) {
@@ -249,11 +251,12 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
private void processContainerTransferIntent(ContainerTransferIntent i) {
Assert.notNull(i.getObject());
Assert.notNull(i.getObject().getTerrain());
if (i.getContainer() == null)
moveObject(i.getObject(), i.getObject().getLocation());
else
if (i.getContainer() == null) {
if (i.getObject().getTerrain() != null)
moveObject(i.getObject(), i.getObject().getLocation());
} else {
moveObject(i.getObject(), i.getContainer(), i.getObject().getLocation());
}
}
private void handleZoneIn(CreatureObject creature, Player player, boolean firstZone) {
@@ -316,6 +319,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
}
private void moveObject(SWGObject obj, Location requestedLocation) {
Assert.notNull(requestedLocation.getTerrain());
awarenessHandler.moveObject(obj, requestedLocation);
}