10.0.0.0

- Fixed a bug that caused all fall damage to be cancelled instead of just fall damage from a player's flight being disabled.
SolarMC-Dev · Jan 15, 2020 · bfa20cf · bfa20cf
1 parent 04c4ac1
commit bfa20cf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...in/java/com/SirBlobman/combatlogx/expansion/cheat/prevention/listener/ListenerFlight.java b/...in/java/com/SirBlobman/combatlogx/expansion/cheat/prevention/listener/ListenerFlight.java
@@ -16,7 +16,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 
 public class ListenerFlight implements Listener {
@@ -69,7 +68,12 @@ public void onDamage(EntityDamageEvent e) {
 
         Entity entity = e.getEntity();
         if(!(entity instanceof Player)) return;
-
+
+        Player player = (Player) entity;
+        UUID uuid = player.getUniqueId();
+        if(!this.preventFallDamage.contains(uuid)) return;
+
         e.setCancelled(true);
+        this.preventFallDamage.remove(uuid);
     }
 }