diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java b/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java index 3d58583..277809e 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/LncvrtBox.java @@ -18,6 +18,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.TabExecutor; import org.bukkit.entity.Player; import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.inventory.Inventory; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; @@ -101,7 +102,6 @@ public final class LncvrtBox extends JavaPlugin implements Listener, TabExecutor getServer().getPluginManager().registerEvents(new BlockPlaceListener(), this); getServer().getPluginManager().registerEvents(new BlockBreakListener(this), this); getServer().getPluginManager().registerEvents(new CraftItemListener(), this); - getServer().getPluginManager().registerEvents(new EntityDamageByEntityListener(), this); getServer().getPluginManager().registerEvents(new EntityDamageListener(this), this); getServer().getPluginManager().registerEvents(new EntityPickupItemListener(this), this); getServer().getPluginManager().registerEvents(new EntityResurrectListener(this), this); diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageByEntityListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageByEntityListener.java deleted file mode 100644 index c01d6d7..0000000 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageByEntityListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.github.lncvrt.lncvrtbox.events; - -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.entity.EntityType; - -public class EntityDamageByEntityListener implements Listener { - @EventHandler - public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { - if (event.getDamager().getType() == EntityType.END_CRYSTAL || event.getDamager().getType() == EntityType.TNT_MINECART || event.getDamager().getType() == EntityType.TNT) { - double damage = event.getDamage(); - event.setDamage(damage * 0.4); - } - } -} diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java index cfa719c..4837cea 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityDamageListener.java @@ -1,7 +1,6 @@ package io.github.lncvrt.lncvrtbox.events; import io.github.lncvrt.lncvrtbox.LncvrtBox; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -34,9 +33,5 @@ public class EntityDamageListener implements Listener { } } } - if (event.getCause() == EntityDamageEvent.DamageCause.BLOCK_EXPLOSION) { - double damage = event.getDamage(); - event.setDamage(damage * 0.4); - } } } diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java index 00142cc..ad844c1 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java @@ -24,7 +24,7 @@ public class EntityResurrectListener implements Listener { event.setCancelled(true); return; } - player.setCooldown(Material.TOTEM_OF_UNDYING, 20 * 8); + player.setCooldown(Material.TOTEM_OF_UNDYING, 20 * 5); plugin.getServer().broadcastMessage("%s%sLncvrtBox %s%s» %s%s has popped their totem".formatted(GOLD, BOLD, GRAY, BOLD, RESET, player.getName())); } }