From e54f3a679ecc260ce0d0c220af8b0e98a815f01d Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <mcmonkey4eva@hotmail.com>
Date: Tue, 31 May 2016 06:45:22 -0700
Subject: [PATCH] 0.6, Add a config option to toggle death messages

---
 pom.xml                                                 | 2 +-
 src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java | 2 +-
 src/main/java/org/mcmonkey/sentinel/SentinelTrait.java  | 4 ++++
 src/main/resources/config.yml                           | 4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f1b341..2ee4413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.mcmonkey</groupId>
     <artifactId>sentinel</artifactId>
     <packaging>jar</packaging>
-    <version>0.5</version>
+    <version>0.6</version>
     <name>Sentinel</name>
     <description>Combat NPCs for Spigot</description>
 
diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java b/src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java
index 8a2d6f0..55aa6a0 100644
--- a/src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java
+++ b/src/main/java/org/mcmonkey/sentinel/SentinelPlugin.java
@@ -68,7 +68,7 @@ public void onEnable() {
         instance = this;
         CitizensAPI.getTraitFactory().registerTrait(TraitInfo.create(SentinelTrait.class).withName("sentinel"));
         saveDefaultConfig();
-        if (getConfig().getInt("config version", 0) != 4) {
+        if (getConfig().getInt("config version", 0) != 5) {
             getLogger().warning("Outdated Sentinel config - please delete it to regenerate it!");
         }
         BukkitRunnable postLoad = new BukkitRunnable() {
diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java b/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java
index 825f0b9..03ecc73 100644
--- a/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java
+++ b/src/main/java/org/mcmonkey/sentinel/SentinelTrait.java
@@ -21,6 +21,7 @@
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
@@ -1146,6 +1147,9 @@ public void whenWeDie(EntityDeathEvent event) {
         if (CitizensAPI.getNPCRegistry().isNPC(event.getEntity())
                 && CitizensAPI.getNPCRegistry().getNPC(event.getEntity()).getUniqueId().equals(npc.getUniqueId())) {
             event.getDrops().clear();
+            if (event instanceof PlayerDeathEvent && !SentinelPlugin.instance.getConfig().getBoolean("random.death messages", true)) {
+                ((PlayerDeathEvent) event).setDeathMessage("");
+            }
             if (!SentinelPlugin.instance.getConfig().getBoolean("random.workaround drops", false)) {
                 event.getDrops().addAll(drops);
             }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 5b92605..25fbe29 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -38,9 +38,11 @@ random:
     workaround damage: false
     # Whether to enforce drops even when 'keepInventory' or similar are enabled.
     workaround drops: false
+    # Whether to permit death messages to show for Sentinel NPC deaths.
+    death messages: true
 
 # How fast to recalculate, in ticks.
 update rate: 10
 
 # Do not touch!
-config version: 4
+config version: 5