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
commitbfd502b812050346fed36954378be92f24efb484 (patch)
treed7963275d5994475c7e9c7fbfff592343d37f26b
parent8bad78402afec1a5017f8e1ef76591e48b0ce3d7 (diff)
downloadEssentials-bfd502b812050346fed36954378be92f24efb484.tar
Essentials-bfd502b812050346fed36954378be92f24efb484.tar.gz
Essentials-bfd502b812050346fed36954378be92f24efb484.tar.lz
Essentials-bfd502b812050346fed36954378be92f24efb484.tar.xz
Essentials-bfd502b812050346fed36954378be92f24efb484.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;
}