From 04dfc70bb40f55bfe45a63c4516e0b1f7b649806 Mon Sep 17 00:00:00 2001 From: steev Date: Sun, 14 Jul 2024 14:48:48 +0200 Subject: [PATCH] added broken damage listener and registered it --- .../java/de/steev/bm/BetterMinecraft.java | 2 ++ .../de/steev/bm/Listener/DamageListener.java | 25 +++++++++++++++++++ .../steev/bm/Listener/InteractListener.java | 1 + 3 files changed, 28 insertions(+) create mode 100644 src/main/java/de/steev/bm/Listener/DamageListener.java diff --git a/src/main/java/de/steev/bm/BetterMinecraft.java b/src/main/java/de/steev/bm/BetterMinecraft.java index 7a92030..2b8aa5c 100644 --- a/src/main/java/de/steev/bm/BetterMinecraft.java +++ b/src/main/java/de/steev/bm/BetterMinecraft.java @@ -2,6 +2,7 @@ package de.steev.bm; import de.steev.bm.Commands.back; import de.steev.bm.Listener.BedListener; +import de.steev.bm.Listener.DamageListener; import de.steev.bm.Listener.InteractListener; import de.steev.bm.Listener.KillListener; import de.steev.bm.Manager.GameManager; @@ -47,6 +48,7 @@ public class BetterMinecraft extends JavaPlugin implements Listener { this.getServer().getPluginManager().registerEvents(new BedListener(this.gameManager), this); 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/DamageListener.java b/src/main/java/de/steev/bm/Listener/DamageListener.java new file mode 100644 index 0000000..0f0a2e6 --- /dev/null +++ b/src/main/java/de/steev/bm/Listener/DamageListener.java @@ -0,0 +1,25 @@ +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.entity.EntityDamageByEntityEvent; + +public class DamageListener implements Listener { + + private GameManager gameManager; + + public DamageListener(GameManager gameManager) { + gameManager.getPlugin().getLogger().info("Damage Listener Registered"); + this.gameManager = gameManager; + } + + @EventHandler + public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { + if((event.getEntity() instanceof Player player)) { + event.setCancelled(true); + player.damage(event.getFinalDamage()); + } + } +} diff --git a/src/main/java/de/steev/bm/Listener/InteractListener.java b/src/main/java/de/steev/bm/Listener/InteractListener.java index 8054c85..54aaea6 100644 --- a/src/main/java/de/steev/bm/Listener/InteractListener.java +++ b/src/main/java/de/steev/bm/Listener/InteractListener.java @@ -26,6 +26,7 @@ public class InteractListener implements Listener { /** the clicked block */ Block target = event.getClickedBlock(); /** the location of the clicked block */ + assert target != null; Location loc = target.getLocation().clone().add(0.5, 0.5, 0.5); Material[] drops; int[] amounts;