Fixed player death event
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user