From 366cb327a48f7e58c8fecb9b2ebe5c0b4d864bc8 Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Mon, 14 Feb 2022 09:57:19 +0100 Subject: [PATCH] Relocate custom listeners --- .../GriefPrevention/PlayerEventHandler.java | 44 ----------------- .../listeners/AltitudeListener.java | 47 +++++++++++++++++++ 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index b4892b9..f828e50 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -18,7 +18,6 @@ package me.ryanhamshire.GriefPrevention; -import com.destroystokyo.paper.event.block.TNTPrimeEvent; import me.ryanhamshire.GriefPrevention.events.ClaimInspectionEvent; import me.ryanhamshire.GriefPrevention.events.VisualizationEvent; import org.bukkit.BanList; @@ -41,7 +40,6 @@ import org.bukkit.block.data.Waterlogged; import org.bukkit.command.Command; import org.bukkit.entity.AbstractHorse; import org.bukkit.entity.Animals; -import org.bukkit.entity.Arrow; import org.bukkit.entity.Creature; import org.bukkit.entity.Donkey; import org.bukkit.entity.Entity; @@ -61,17 +59,13 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; -import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketFillEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerEggThrowEvent; -import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.event.player.PlayerInteractAtEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; @@ -79,8 +73,6 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerItemHeldEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerKickEvent; -import org.bukkit.event.player.PlayerLoginEvent; -import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.event.player.PlayerPortalEvent; import org.bukkit.event.player.PlayerQuitEvent; @@ -2332,40 +2324,4 @@ class PlayerEventHandler implements Listener return result; } - @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) - public void onTNTPrime(TNTPrimeEvent event) { - if(event.getReason() == TNTPrimeEvent.PrimeReason.PROJECTILE) { - Entity entity = event.getPrimerEntity(); - if(entity instanceof Arrow) { - Arrow arrow = (Arrow) entity; - if(arrow.getShooter() instanceof Player) { - Player player = (Player) arrow.getShooter(); - Claim claim = GriefPrevention.instance.dataStore.getClaimAt(event.getBlock().getLocation(), true, null); - if (claim != null) { - if (claim.allowAccess(player) != null) { - event.setCancelled(true); - } - } - } - } - } - } - - @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) - public void onPlayerBoatBlockBreak(EntityChangeBlockEvent event) - { - if (event.getEntity() instanceof Vehicle && !event.getEntity().getPassengers().isEmpty()) - { - Entity driver = event.getEntity().getPassengers().get(0); - if (driver instanceof Player) - { - Block block = event.getBlock(); - if (GriefPrevention.instance.allowBreak((Player) driver, block, block.getLocation()) != null) - { - event.setCancelled(true); - return; - } - } - } - } } diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/listeners/AltitudeListener.java b/src/main/java/me/ryanhamshire/GriefPrevention/listeners/AltitudeListener.java index cc7f0a2..bf60b75 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/listeners/AltitudeListener.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/listeners/AltitudeListener.java @@ -1,12 +1,22 @@ package me.ryanhamshire.GriefPrevention.listeners; +import com.destroystokyo.paper.event.block.TNTPrimeEvent; +import me.ryanhamshire.GriefPrevention.Claim; import me.ryanhamshire.GriefPrevention.CreateClaimResult; import me.ryanhamshire.GriefPrevention.DataStore; import me.ryanhamshire.GriefPrevention.GriefPrevention; import me.ryanhamshire.GriefPrevention.Messages; import org.bukkit.Bukkit; import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Vehicle; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityChangeBlockEvent; public class AltitudeListener implements Listener { @@ -42,4 +52,41 @@ public class AltitudeListener implements Listener { } } } + + @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) + public void onTNTPrime(TNTPrimeEvent event) { + if(event.getReason() == TNTPrimeEvent.PrimeReason.PROJECTILE) { + Entity entity = event.getPrimerEntity(); + if(entity instanceof Arrow) { + Arrow arrow = (Arrow) entity; + if(arrow.getShooter() instanceof Player) { + Player player = (Player) arrow.getShooter(); + Claim claim = GriefPrevention.instance.dataStore.getClaimAt(event.getBlock().getLocation(), true, null); + if (claim != null) { + if (claim.allowAccess(player) != null) { + event.setCancelled(true); + } + } + } + } + } + } + + @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) + public void onPlayerBoatBlockBreak(EntityChangeBlockEvent event) + { + if (event.getEntity() instanceof Vehicle && !event.getEntity().getPassengers().isEmpty()) + { + Entity driver = event.getEntity().getPassengers().get(0); + if (driver instanceof Player) + { + Block block = event.getBlock(); + if (GriefPrevention.instance.allowBreak((Player) driver, block, block.getLocation()) != null) + { + event.setCancelled(true); + return; + } + } + } + } } \ No newline at end of file