From 208abcd4e94a78f5101add7d438b77f9fcdb0bff Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Thu, 7 Jan 2016 15:45:05 -0600
Subject: [PATCH] Fixed null pointer exception when CreatureObject is null

---
 src/resources/player/Player.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/resources/player/Player.java b/src/resources/player/Player.java
index ee7f924f9..19ea5f221 100644
--- a/src/resources/player/Player.java
+++ b/src/resources/player/Player.java
@@ -185,6 +185,10 @@ public class Player implements Serializable, Comparable<Player> {
 	
 	@Override
 	public int compareTo(Player p) {
+		if (creatureObject == null)
+			return p.getCreatureObject() == null ? 0 : -1;
+		else if (p.getCreatureObject() == null)
+			return 1;
 		return creatureObject.compareTo(p.getCreatureObject());
 	}