diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java index 20a63ca..51d6b67 100644 --- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java +++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java @@ -63,9 +63,11 @@ public class GamePlayerChatListener implements Listener { plugin.logDebug("Ignore chat message due to event cancellation: " + event.getMessage()); return; } - if (event.isCancelled() && plugin.adminPrivateChatHook.ac.toggledPlayers.contains(event.getPlayer().getName())) { - plugin.logDebug("Ignore AdminChat message due to event cancellation: " + event.getMessage()); - return; + if (plugin.adminPrivateChatHook != null) { + if (event.isCancelled() && plugin.adminPrivateChatHook.ac.toggledPlayers.contains(event.getPlayer().getName())) { + plugin.logDebug("Ignore AdminChat message due to event cancellation: " + event.getMessage()); + return; + } } if (event.getPlayer().hasPermission("irc.message.gamechat")) { plugin.logDebug("Player " + event.getPlayer().getName() + " has permission irc.message.gamechat"); diff --git a/src/main/java/com/cnaude/purpleirc/Hooks/GriefPreventionHook.java b/src/main/java/com/cnaude/purpleirc/Hooks/GriefPreventionHook.java index 47ea23f..a443ebe 100644 --- a/src/main/java/com/cnaude/purpleirc/Hooks/GriefPreventionHook.java +++ b/src/main/java/com/cnaude/purpleirc/Hooks/GriefPreventionHook.java @@ -41,9 +41,13 @@ public class GriefPreventionHook { public boolean isMuted(Player player) { plugin.logDebug("GriefPrevention: " + player.getDisplayName()); if (gp != null) { - return gp.dataStore.isSoftMuted(player.getUniqueId()); + try { + return gp.dataStore.isSoftMuted(player.getUniqueId()); + } catch (Exception ex) { + plugin.logError(ex.getMessage()); + } } return false; } - + }