From 4a7f94c75deb2e9f2a3f4cbab3a7d605626a6d16 Mon Sep 17 00:00:00 2001 From: Myles Date: Sat, 10 Dec 2022 13:32:25 -0600 Subject: this is what you get for not testing things (fix a bug, it might have been game-breaking ._.) --- src/main/java/com/MylesAndMore/tumble/EventListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/MylesAndMore/tumble/EventListener.java b/src/main/java/com/MylesAndMore/tumble/EventListener.java index a18a9d3..8e07509 100644 --- a/src/main/java/com/MylesAndMore/tumble/EventListener.java +++ b/src/main/java/com/MylesAndMore/tumble/EventListener.java @@ -273,10 +273,12 @@ public class EventListener implements Listener { if (TumbleManager.getGameWorld() == null) { return; } - // Check to see if a player got damaged in the gameWorld, if so, cancel it + // Check to see if a player got damaged by another entity (player, snowball, etc) in the gameWorld, if so, cancel it if (event.getEntity().getWorld() == Bukkit.getWorld(TumbleManager.getGameWorld())) { if (event.getEntity() instanceof Player) { - event.setCancelled(true); + if (event.getCause() == EntityDamageEvent.DamageCause.ENTITY_ATTACK || event.getCause() == EntityDamageEvent.DamageCause.ENTITY_SWEEP_ATTACK) { + event.setCancelled(true); + } } } } -- cgit v1.2.3