From dd1992e99c6a3b0516737d48760708d01ae269ad Mon Sep 17 00:00:00 2001 From: Shinare Date: Fri, 11 Oct 2024 19:54:29 +0300 Subject: [PATCH] Removed unused LoE specific component --- .../zivilon/dungeontools/DungeonTools.java | 8 -- .../barrow_wight_teleport_listener.java | 76 ------------------- 2 files changed, 84 deletions(-) delete mode 100644 src/main/java/com/zivilon/dungeontools/listeners/barrow_wight_teleport_listener.java diff --git a/src/main/java/com/zivilon/dungeontools/DungeonTools.java b/src/main/java/com/zivilon/dungeontools/DungeonTools.java index e8eccd6..de6dcd1 100644 --- a/src/main/java/com/zivilon/dungeontools/DungeonTools.java +++ b/src/main/java/com/zivilon/dungeontools/DungeonTools.java @@ -9,7 +9,6 @@ import java.util.HashMap; import com.zivilon.dungeontools.Area; import com.zivilon.dungeontools.listeners.kill_tracker_listener; -import com.zivilon.dungeontools.listeners.barrow_wight_teleport_listener; import com.zivilon.dungeontools.listeners.aggression_listener; import com.zivilon.dungeontools.commands.kill_tracker_command; import com.zivilon.dungeontools.commands.loot_chest_command; @@ -20,8 +19,6 @@ public class DungeonTools extends JavaPlugin { public FileConfiguration items_config; public FileConfiguration areas_config; - public boolean enable_specific_listeners = false; - public HashMap tracking_areas = new HashMap<>(); @Override @@ -45,11 +42,6 @@ public class DungeonTools extends JavaPlugin { getServer().getPluginManager().registerEvents(new kill_tracker_listener(tracking_areas), this); // Register the EntityDamage event listener for aggression control getServer().getPluginManager().registerEvents(new aggression_listener(this), this); - - if (enable_specific_listeners) { - // Register the EntityDamage event listener - getServer().getPluginManager().registerEvents(new barrow_wight_teleport_listener(), this); - } } @Override diff --git a/src/main/java/com/zivilon/dungeontools/listeners/barrow_wight_teleport_listener.java b/src/main/java/com/zivilon/dungeontools/listeners/barrow_wight_teleport_listener.java deleted file mode 100644 index a2b4635..0000000 --- a/src/main/java/com/zivilon/dungeontools/listeners/barrow_wight_teleport_listener.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.zivilon.dungeontools.listeners; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.LivingEntity; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityDamageEvent; - -public class barrow_wight_teleport_listener implements Listener { - - // Target teleport location - private final Location teleport_location = new Location( - Bukkit.getWorld("DIM100"), // Change to your actual world name - -100203.5, - 108.0, - 46030.5 - ); - - // Bounding box of the area from where the Barrow-wight should not be teleported - private final Location corner_1 = new Location( - teleport_location.getWorld(), - -100227, - 90, - 46021 - ); - - private final Location corner_2 = new Location( - teleport_location.getWorld(), - -100173, - 150, - 46052 - ); - - @EventHandler - public void onEntityDamage(EntityDamageEvent event) { - Entity entity = event.getEntity(); - - if (entity.getType() == EntityType.valueOf("LOTR_BARROWWIGHT")) { // Change to the actual EntityType name - Location entity_location = entity.getLocation(); - - if (Math.abs(entity_location.getX() - teleport_location.getX()) <= 200 && - Math.abs(entity_location.getZ() - teleport_location.getZ()) <= 200) { - - if (isOutsideBox(entity_location, corner_1, corner_2)) { - if (entity instanceof LivingEntity) { - LivingEntity livingEntity = (LivingEntity) entity; - - // Heal the entity to max health - livingEntity.setHealth(livingEntity.getMaxHealth()); - } - event.setCancelled(true); - entity.teleport(teleport_location); - } - } - } - } - - private boolean isOutsideBox(Location point, Location corner_1, Location corner_2) { - boolean return_value = false; - if (point.getX() < corner_1.getX() || point.getX() > corner_2.getX()) { - return_value = true; - } - if (point.getY() < corner_1.getY() || point.getY() > corner_2.getY()) { - return_value = true; - } - if (point.getZ() < corner_1.getZ() || point.getZ() > corner_2.getZ()) { - return_value = true; - } - - return return_value; - } -}