- Fixed a possible NPE in hasProperty in the Player class.

This commit is contained in:
Sloth
2012-09-13 18:13:56 +00:00
parent cba9d6f6f9
commit 6303ebd06a

View File

@@ -2439,7 +2439,7 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
return false;
}
} else if (property.startsWith("Chosen")) {
if (!source.getChosenPlayer().equals(this)) {
if (source.getChosenPlayer() == null || !source.getChosenPlayer().equals(this)) {
return false;
}
}