projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-08-27 16:56:52 -04:00
Code Issues Projects Releases Wiki Activity

Fixed observers issue where when in cells players get their chat messages twice

Browse Source
This commit is contained in:
Obique PSWG
2015-07-24 08:00:47 -05:00
parent 9a0950220f
commit 004b8b4176
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+8 -1
View File
@@ -659,7 +659,9 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
private boolean isValidPlayer(Player player) {
if (player == null)
if (player == null || player == getOwner())
return false;
if (getOwner() == null)
return false;
if (player.equals(getOwner()))
return false;
@@ -667,6 +669,11 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
return false;
if (player.getCreatureObject().getPlayerObject() == null)
return false;
SWGObject creature = getOwner().getCreatureObject();
if (creature == null)
return false;
if (player.getCreatureObject().equals(creature))
return false;
return true;
}