Fixed player death event

This commit is contained in:
2024-10-21 18:15:45 +02:00
parent 1725f52f43
commit d1a94fc18f

View File

@@ -5,6 +5,7 @@ import org.bukkit.entity.Player
import org.bukkit.event.Event import org.bukkit.event.Event
import org.bukkit.event.block.BlockBreakEvent import org.bukkit.event.block.BlockBreakEvent
import org.bukkit.event.entity.EntityDeathEvent import org.bukkit.event.entity.EntityDeathEvent
import org.bukkit.event.entity.PlayerDeathEvent
import java.util.logging.Logger import java.util.logging.Logger
@@ -129,17 +130,20 @@ class Barkeeper(private val logger: Logger) {
return drink; return drink;
} }
if (event is EntityDeathEvent) { if (event is EntityDeathEvent && event !is PlayerDeathEvent) {
logger.info("EntityDeathEvent " + event.entity.name) logger.info("EntityDeathEvent " + event.entity.name)
val drinkByEvent = drinksByEvent["entityOnDeath"] ?: return null; val drinkByEvent = drinksByEvent["entityOnDeath"] ?: return null;
val drink = (drinkByEvent as Map<String, Serving>)[event.entity.name] ?: return null; val drink = (drinkByEvent as Map<String, Serving>)[event.entity.name] ?: return null;
return drink; return drink;
} }
logger.info(event.eventName)
val drinkByEvent = drinksByEvent[event.eventName] ?: return null; val drinkByEvent = drinksByEvent[event.eventName] ?: return null;
if (drinkByEvent is Serving) { if (drinkByEvent is Serving) {
return drinkByEvent; return drinkByEvent;
} }
return null; return null;
} }
} }