cancel fall damage & keep knockback on hit

GamesInTheBox-MC · Dec 17, 2023 · 36cf688 · 36cf688
1 parent 94ebd9f
commit 36cf688
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/src/main/java/me/hsgamer/gamesinthebox/pinata/feature/ListenerFeature.java b/src/main/java/me/hsgamer/gamesinthebox/pinata/feature/ListenerFeature.java
@@ -13,6 +13,7 @@
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 
 import java.util.Optional;
@@ -60,22 +61,30 @@ public boolean isDamageAsScore() {
 
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPinataDamage(EntityDamageByEntityEvent event) {
+        Entity damager = event.getDamager();
+        if (!(damager instanceof Player)) return;
+        Player player = (Player) damager;
+
         Entity entity = event.getEntity();
         if (!pinataFeature.contains(entity)) return;
-        event.setCancelled(true);
 
-        Entity damager = event.getDamager();
-        if (damager instanceof Player) {
-            Player player = (Player) damager;
-
-            if (damageAsScore) {
-                pointFeature.applyPoint(player.getUniqueId(), (int) event.getFinalDamage());
-            } else {
-                pointFeature.applyPoint(player.getUniqueId(), Pinata.POINT_HIT);
-            }
+        event.setDamage(0);
+
+        if (damageAsScore) {
+            pointFeature.applyPoint(player.getUniqueId(), (int) event.getFinalDamage());
+        } else {
+            pointFeature.applyPoint(player.getUniqueId(), Pinata.POINT_HIT);
         }
     }
 
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    public void onPinataFallDamage(EntityDamageEvent event) {
+        if (event.getCause() != EntityDamageEvent.DamageCause.FALL) return;
+        if (!pinataFeature.contains(event.getEntity())) return;
+
+        event.setCancelled(true);
+    }
+
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPinataDeath(EntityDeathEvent event) {
         Entity entity = event.getEntity();