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

Changed Holocore to be limited to a single galaxy

Browse Source
This commit is contained in:
Obique PSWG
2016-01-06 21:49:29 -06:00
parent 8f66a19627
commit f968e0dfc7
21 changed files with 155 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+3 -7
View File
@@ -28,6 +28,7 @@
package services.objects;
import intents.PlayerEventIntent;
import intents.RequestZoneInIntent;
import intents.network.GalacticPacketIntent;
import intents.object.ObjectCreateIntent;
import intents.object.ObjectCreatedIntent;
@@ -119,10 +120,7 @@ public class ObjectAwareness extends Service {
creature.setOwner(null);
p.setCreatureObject(null);
break;
case PE_FIRST_ZONE:
break;
case PE_ZONE_IN:
creature.clearAware();
startScene(creature, creature.getLocation());
update(creature);
break;
@@ -150,14 +148,12 @@ public class ObjectAwareness extends Service {
Location old = object.getLocation();
object.setLocation(oti.getNewLocation());
if (oti.getParent() != null) {
if (creature)
startScene((CreatureObject) object, oti.getNewLocation());
move(object, oti.getParent(), oti.getNewLocation());
} else {
if (creature)
startScene((CreatureObject) object, oti.getNewLocation());
moveFromOld(object, old);
}
if (creature)
new RequestZoneInIntent(owner, (CreatureObject) object, true).broadcast();
new PlayerEventIntent(object.getOwner(), PlayerEvent.PE_ZONE_IN).broadcast();
}