projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-07-13 20:00:58 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into radials

Browse Source
This commit is contained in:
Obique PSWG
2015-08-04 23:48:39 -05:00
parent d865c166ab 53dc2bb160
commit 3c0462a1bc
24 changed files with 663 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+6 -1
View File
@@ -205,7 +205,8 @@ public class ObjectManager extends Manager {
private void loadObject(SWGObject obj) {
obj.setOwner(null);
if (!(obj instanceof CreatureObject) || ((CreatureObject) obj).getPlayerObject() == null)
// if player is not a player
if (!(obj instanceof CreatureObject && ((CreatureObject) obj).hasSlot("ghost")))
objectAwareness.add(obj);
if (obj instanceof CreatureObject && ((CreatureObject) obj).getPlayerObject() != null) {
if (!obj.hasSlot("bank"))
@@ -265,10 +266,14 @@ public class ObjectManager extends Manager {
case PE_DISAPPEAR:
p.getCreatureObject().clearAware();
objectAwareness.remove(p.getCreatureObject());
for (SWGObject obj : p.getCreatureObject().getObservers())
p.getCreatureObject().destroyObject(obj.getOwner());
break;
case PE_ZONE_IN:
p.getCreatureObject().clearAware();
objectAwareness.update(p.getCreatureObject());
if (p.getCreatureObject().getParent() == null)
p.getCreatureObject().createObject(p);
break;
default:
break;