From c081c824c09f0d0f4b5585710cd2153bed1c780d Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Sat, 8 Aug 2015 12:07:34 -0500 Subject: [PATCH] Fixed null pointer exception in Player's hashCode function --- src/resources/player/Player.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/resources/player/Player.java b/src/resources/player/Player.java index 401c4d0cf..4e3ff3c6d 100644 --- a/src/resources/player/Player.java +++ b/src/resources/player/Player.java @@ -215,6 +215,8 @@ public class Player implements Serializable, Comparable { @Override public int hashCode() { + if (creatureObject == null) + return getUserId(); return Long.valueOf(creatureObject.getObjectId()).hashCode() ^ getUserId(); }