From 3428f467d4e6daa93f60862e6eec107fed18aa3f Mon Sep 17 00:00:00 2001
From: tilera <tilera.mpz@gmail.com>
Date: Wed, 8 May 2019 21:09:55 +0200
Subject: [PATCH] Snap death messages

---
 src/main/java/anvil/infinity/effects/EffectSnap.java        | 6 ++++++
 src/main/java/anvil/infinity/helpers/SnapMessageHelper.java | 2 +-
 src/main/resources/assets/infinity/lang/de_DE.lang          | 3 ++-
 src/main/resources/assets/infinity/lang/en_US.lang          | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/anvil/infinity/effects/EffectSnap.java b/src/main/java/anvil/infinity/effects/EffectSnap.java
index 7125ab4..d98f1cd 100644
--- a/src/main/java/anvil/infinity/effects/EffectSnap.java
+++ b/src/main/java/anvil/infinity/effects/EffectSnap.java
@@ -2,8 +2,10 @@ package anvil.infinity.effects;
 
 import anvil.infinity.Infinity;
 import anvil.infinity.SoundHelper;
+import anvil.infinity.helpers.SnapMessageHelper;
 import anvil.infinity.registry.Effects;
 import anvil.infinity.registry.Sounds;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
@@ -27,11 +29,15 @@ public class EffectSnap extends Potion {
         if (e.getEntityLiving().getActivePotionEffect(Effects.snapEffect) != null) {
             if (e.getEntityLiving().getActivePotionEffect(Effects.snapEffect).getDuration() == 1) {
                 e.getEntityLiving().playSound(Sounds.snap, 5, 0);
+                if (e.getEntityLiving().hasCustomName() || e.getEntityLiving() instanceof EntityPlayer) {
+                    SnapMessageHelper.deathMessage(e.getEntityLiving());
+                }
                 e.getEntityLiving().setHealth(0);
 
 
 
 
+
             }
         }
     }
diff --git a/src/main/java/anvil/infinity/helpers/SnapMessageHelper.java b/src/main/java/anvil/infinity/helpers/SnapMessageHelper.java
index 12e6c6b..ba751af 100644
--- a/src/main/java/anvil/infinity/helpers/SnapMessageHelper.java
+++ b/src/main/java/anvil/infinity/helpers/SnapMessageHelper.java
@@ -11,7 +11,7 @@ public class SnapMessageHelper {
     public static MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
 
     public static void deathMessage(EntityLivingBase entity) {
-        TextComponentString msg = new TextComponentString(entity.getName());
+        TextComponentString msg = new TextComponentString(entity.getName() + " ");
         msg.appendSibling(new TextComponentTranslation("infinity.snap.death"));
         server.getPlayerList().sendMessage(msg);
 
diff --git a/src/main/resources/assets/infinity/lang/de_DE.lang b/src/main/resources/assets/infinity/lang/de_DE.lang
index 317bc5a..c22f8c5 100644
--- a/src/main/resources/assets/infinity/lang/de_DE.lang
+++ b/src/main/resources/assets/infinity/lang/de_DE.lang
@@ -3,4 +3,5 @@ item.reality_stone.name=Realitätsstein
 item.soul_stone.name=Seelenstein
 item.time_stone.name=Zeitstein
 item.mind_stone.name=Gedankenstein
-infinity.snap.text=Du hättest auf den Kopf zielen sollen.
\ No newline at end of file
+infinity.snap.text=Du hättest auf den Kopf zielen sollen.
+infinity.snap.death=zerfiel zu Staub
\ No newline at end of file
diff --git a/src/main/resources/assets/infinity/lang/en_US.lang b/src/main/resources/assets/infinity/lang/en_US.lang
index 31056e1..7dc9b2c 100644
--- a/src/main/resources/assets/infinity/lang/en_US.lang
+++ b/src/main/resources/assets/infinity/lang/en_US.lang
@@ -4,4 +4,4 @@ item.soul_stone.name=Soul Stone
 item.time_stone.name=Time Stone
 item.mind_stone.name=Mind Stone
 infinity.snap.text=You should have gone for the head.
-infinity.snap.death= died by the Snap
\ No newline at end of file
+infinity.snap.death=was dusted away
\ No newline at end of file