diff --git a/src/main/kotlin/de/sh_edraft/service/Barkeeper.kt b/src/main/kotlin/de/sh_edraft/service/Barkeeper.kt
index 8437a9e..b5141d1 100644
--- a/src/main/kotlin/de/sh_edraft/service/Barkeeper.kt
+++ b/src/main/kotlin/de/sh_edraft/service/Barkeeper.kt
@@ -5,6 +5,7 @@ import org.bukkit.entity.Player
 import org.bukkit.event.Event
 import org.bukkit.event.block.BlockBreakEvent
 import org.bukkit.event.entity.EntityDeathEvent
+import org.bukkit.event.entity.PlayerDeathEvent
 import java.util.logging.Logger
 
 
@@ -129,17 +130,20 @@ class Barkeeper(private val logger: Logger) {
             return drink;
         }
 
-        if (event is EntityDeathEvent) {
+        if (event is EntityDeathEvent && event !is PlayerDeathEvent) {
             logger.info("EntityDeathEvent " + event.entity.name)
             val drinkByEvent = drinksByEvent["entityOnDeath"] ?: return null;
             val drink = (drinkByEvent as Map<String, Serving>)[event.entity.name] ?: return null;
             return drink;
         }
 
+        logger.info(event.eventName)
+
         val drinkByEvent = drinksByEvent[event.eventName] ?: return null;
         if (drinkByEvent is Serving) {
             return drinkByEvent;
         }
+
         return null;
     }
 }
\ No newline at end of file