summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-06-05 00:00:41 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-06-05 00:00:41 +0000
commit7b825cc8d5658188fc759c9ee8b64fdd224ba058 (patch)
tree5c92cded925c68dee33d336d2a21f4cf4afc3d91
parenta005436510cba72a12dff60724cb856ed69b6674 (diff)
downloadEssentials-7b825cc8d5658188fc759c9ee8b64fdd224ba058.tar
Essentials-7b825cc8d5658188fc759c9ee8b64fdd224ba058.tar.gz
Essentials-7b825cc8d5658188fc759c9ee8b64fdd224ba058.tar.lz
Essentials-7b825cc8d5658188fc759c9ee8b64fdd224ba058.tar.xz
Essentials-7b825cc8d5658188fc759c9ee8b64fdd224ba058.zip
NPE fix for offline users in UserData
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1583 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/UserData.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java
index e9f05b8bd..8261ba7a9 100644
--- a/Essentials/src/com/earth2me/essentials/UserData.java
+++ b/Essentials/src/com/earth2me/essentials/UserData.java
@@ -324,7 +324,7 @@ public abstract class UserData extends PlayerExtension implements IConf
private ItemStack[] _getSavedInventory()
{
int size = config.getInt("inventory.size", 0);
- if (size < 1 || size > getInventory().getSize())
+ if (getInventory() != null && (size < 1 || size > getInventory().getSize()))
{
return null;
}