diff --git a/pom.xml b/pom.xml index 84ef005..4a7a57d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,8 @@ org.spigotmc - spigot-api - 1.20.1-R0.1-SNAPSHOT + spigot + 1.20.6-R0.1-SNAPSHOT provided diff --git a/src/main/java/de/steev/bm/BetterMinecraft.java b/src/main/java/de/steev/bm/BetterMinecraft.java index 2b8aa5c..deeeba5 100644 --- a/src/main/java/de/steev/bm/BetterMinecraft.java +++ b/src/main/java/de/steev/bm/BetterMinecraft.java @@ -49,7 +49,6 @@ public class BetterMinecraft extends JavaPlugin implements Listener { this.getServer().getPluginManager().registerEvents(new KillListener(this.gameManager), this); this.getServer().getPluginManager().registerEvents(new InteractListener(this.gameManager), this); this.getServer().getPluginManager().registerEvents(new DamageListener(this.gameManager), this); - this.getServer().getPluginManager().registerEvents(this, this); this.getCommand("back").setExecutor(new back(this.gameManager)); diff --git a/src/main/java/de/steev/bm/Listener/AnimationListener.java b/src/main/java/de/steev/bm/Listener/AnimationListener.java new file mode 100644 index 0000000..265e18d --- /dev/null +++ b/src/main/java/de/steev/bm/Listener/AnimationListener.java @@ -0,0 +1,26 @@ +package de.steev.bm.Listener; + +import de.steev.bm.Manager.GameManager; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerAnimationEvent; + +public class AnimationListener implements Listener { + + private GameManager gameManager; + + public AnimationListener(GameManager gameManager) { + this.gameManager = gameManager; + } + + @EventHandler + public void OnPlayerAnimation(PlayerAnimationEvent event) { + Player player = event.getPlayer(); + EntityPlayer nmsPlayer = ((CraftPlayer) player).getHandle(); + PlayerConnection connection = nmsPlayer.playerConnection; + + // Sende ein ArmAnimation-Paket, um den Cooldown zu umgehen + connection.a(new PacketPlayInArmAnimation()); + } +} diff --git a/src/main/java/de/steev/bm/Listener/DamageListener.java b/src/main/java/de/steev/bm/Listener/DamageListener.java index 0f0a2e6..a3a2eab 100644 --- a/src/main/java/de/steev/bm/Listener/DamageListener.java +++ b/src/main/java/de/steev/bm/Listener/DamageListener.java @@ -17,9 +17,6 @@ public class DamageListener implements Listener { @EventHandler public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { - if((event.getEntity() instanceof Player player)) { - event.setCancelled(true); - player.damage(event.getFinalDamage()); - } + return; } }