diff --git a/Essentials/src/main/java/com/earth2me/essentials/UserData.java b/Essentials/src/main/java/com/earth2me/essentials/UserData.java index 79d432241..fbac73390 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/UserData.java +++ b/Essentials/src/main/java/com/earth2me/essentials/UserData.java @@ -574,6 +574,10 @@ public abstract class UserData extends PlayerExtension implements IConf { public Map getCommandCooldowns() { final Map map = new HashMap<>(); for (final CommandCooldown c : getCooldownsList()) { + if (c == null) { + // stupid solution to stupid problem + continue; + } map.put(c.pattern(), c.value()); } return map; @@ -581,6 +585,10 @@ public abstract class UserData extends PlayerExtension implements IConf { public Date getCommandCooldownExpiry(final String label) { for (CommandCooldown cooldown : getCooldownsList()) { + if (cooldown == null) { + // stupid solution to stupid problem + continue; + } if (cooldown.pattern().matcher(label).matches()) { return new Date(cooldown.value()); }