From 4d1cdfedc73fc262c50fdd83b86aa52c742f226d Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Fri, 13 Dec 2019 22:02:16 -0700
Subject: [PATCH] forgot a check

---
 .../totalfreedommod/discord/Discord.java            | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
index f63bf20b..b36ecc7e 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import javax.security.auth.login.LoginException;
 import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.GameRuleHandler;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -28,6 +29,7 @@ import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.pravian.aero.util.StringUtils;
 import org.apache.commons.lang.WordUtils;
+import org.bukkit.GameRule;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -125,6 +127,17 @@ public class Discord extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerDeath(PlayerDeathEvent event)
     {
+        try
+        {
+            if (!event.getEntity().getWorld().getGameRuleValue(GameRule.SHOW_DEATH_MESSAGES))
+            {
+                return;
+            }
+        }
+        catch (NullPointerException e)
+        {
+        }
+
         messageChatChannel("**" + event.getDeathMessage() + "**");
     }