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

Removed ObjectCreateIntent, it's effectively the same as ObjectCreatedIntent

Browse Source
This commit is contained in:
Obique PSWG
2016-01-12 03:56:54 -06:00
parent ce24bb4a07
commit ab67aaac39
11 changed files with 53 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+2 -16
View File
@@ -30,7 +30,6 @@ package services.objects;
import intents.PlayerEventIntent;
import intents.RequestZoneInIntent;
import intents.network.GalacticPacketIntent;
import intents.object.ObjectCreateIntent;
import intents.object.ObjectCreatedIntent;
import intents.object.ObjectTeleportIntent;
import intents.object.UpdateObjectAwareness;
@@ -54,7 +53,7 @@ import resources.control.Service;
import resources.objects.SWGObject;
import resources.objects.creature.CreatureObject;
import resources.objects.quadtree.QuadTree;
import resources.objects.staticobject.StaticObject;
import resources.objects.tangible.TangibleObject;
import resources.player.Player;
import resources.server_info.Log;
@@ -68,7 +67,6 @@ public class ObjectAwareness extends Service {
public ObjectAwareness() {
quadTree = new HashMap<Terrain, QuadTree<SWGObject>>();
registerForIntent(PlayerEventIntent.TYPE);
registerForIntent(ObjectCreateIntent.TYPE);
registerForIntent(ObjectCreatedIntent.TYPE);
registerForIntent(ObjectTeleportIntent.TYPE);
registerForIntent(GalacticPacketIntent.TYPE);
@@ -83,10 +81,6 @@ public class ObjectAwareness extends Service {
if (i instanceof PlayerEventIntent)
handlePlayerEventIntent((PlayerEventIntent) i);
break;
case ObjectCreateIntent.TYPE:
if (i instanceof ObjectCreateIntent)
handleObjectCreateIntent((ObjectCreateIntent) i);
break;
case ObjectCreatedIntent.TYPE:
if (i instanceof ObjectCreatedIntent)
handleObjectCreatedIntent((ObjectCreatedIntent) i);
@@ -130,14 +124,6 @@ public class ObjectAwareness extends Service {
}
}
private void handleObjectCreateIntent(ObjectCreateIntent oci) {
SWGObject object = oci.getObject();
if (isInAwareness(object)) {
add(object);
update(object);
}
}
private void handleObjectCreatedIntent(ObjectCreatedIntent oci) {
SWGObject object = oci.getObject();
if (isInAwareness(object)) {
@@ -251,7 +237,7 @@ public class ObjectAwareness extends Service {
}
private boolean isInAwareness(SWGObject object) {
return object.getParent() == null && !(object instanceof StaticObject);
return object.getParent() == null && object instanceof TangibleObject;
}
private double invertNormalizedValue(double x) {