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

Small improvement to observers in SWGObject

Browse Source
This commit is contained in:
Obique PSWG
2016-05-13 12:31:08 -05:00
parent c1c106a457
commit 0d3763b813
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+7 -12
View File
@@ -773,24 +773,19 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
private boolean isValidPlayer(Player player) {
Player owner = getOwner();
if (player == null || player == owner)
return false;
if (player.getCreatureObject() == null)
return false;
if (player.getCreatureObject().getPlayerObject() == null)
return false;
if (player.equals(owner))
if (player == null)
return false;
if (owner == null)
return true;
SWGObject creature = owner.getCreatureObject();
if (creature == null)
if (player.getCreatureObject() == null)
return false;
if (player.getCreatureObject().equals(creature))
if (owner.getCreatureObject() == null)
return true;
if (player.getCreatureObject().equals(owner.getCreatureObject()))
return false;
return true;
return player.getCreatureObject().isLoggedInPlayer();
}
public void sendObserversAndSelf(Packet ... packets) {
sendSelf(packets);
sendObservers(packets);