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

Fixed null pointer exception in update containment

Browse Source
This commit is contained in:
Obique PSWG
2016-01-18 01:52:43 -06:00
parent e98c35a63c
commit 8d5c094b0d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+4 -2
View File
@@ -198,7 +198,8 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
// Get a pre-parent-removal list of the observers so we can send create/destroy/update messages
Set<SWGObject> oldObservers = getObservers();
Player prevOwner = getOwner();
oldObservers.add(prevOwner.getCreatureObject());
if (prevOwner != null)
oldObservers.add(prevOwner.getCreatureObject());
// Remove this object from the old parent if one exists
SWGObject oldParent = null;
@@ -213,7 +214,8 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
// Observer notification
Player newOwner = getOwner();
Set<SWGObject> containerObservers = getObservers();
containerObservers.add(newOwner.getCreatureObject());
if (newOwner != null)
containerObservers.add(newOwner.getCreatureObject());
if (prevOwner != newOwner) {
if (prevOwner != null)
oldObservers.add(prevOwner.getCreatureObject());