From ae2d4a16a12d76d3150af8284d5121ab7697a233 Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:19:09 -0500 Subject: [PATCH 01/12] Should disable trapdoor spawning in the spawn. --- .../TrapdoorListener.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java new file mode 100644 index 0000000..f603f11 --- /dev/null +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -0,0 +1,22 @@ +package me.ShermansWorld.AlathraExtras.disabletrapdoorflipping; + +import com.destroystokyo.paper.MaterialTags; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; + +public class TrapdoorListener implements Listener { + @EventHandler + public void onInteract(PlayerInteractEvent e) { + // Checks if the action is right click, and the right click is at a block. + if(e.getAction() == Action.RIGHT_CLICK_BLOCK + && e.getClickedBlock() != null + && (MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) + && e.getClickedBlock().getWorld().getName().equals("world") + )) // If so, cancel the interaction. + { + e.setCancelled(true); + } + } +} From e202490a8416342a9f3c39355f1fb7c435df432f Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:24:14 -0500 Subject: [PATCH 02/12] Adding some comments --- .../disabletrapdoorflipping/TrapdoorListener.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index f603f11..a95f510 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -6,7 +6,15 @@ import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; +/** + * Listens for trapdoor interaction events + */ public class TrapdoorListener implements Listener { + + /** + * Checks for player interactions with a trapdoor. + * @param e the player interaction event + */ @EventHandler public void onInteract(PlayerInteractEvent e) { // Checks if the action is right click, and the right click is at a block. From 1ed726201ae8169ce757d780f06d3705efc2c4dd Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:26:47 -0500 Subject: [PATCH 03/12] Checking that the player isn't in creative. --- .../AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index a95f510..9bfe210 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -1,6 +1,7 @@ package me.ShermansWorld.AlathraExtras.disabletrapdoorflipping; import com.destroystokyo.paper.MaterialTags; +import org.bukkit.GameMode; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; @@ -22,6 +23,7 @@ public void onInteract(PlayerInteractEvent e) { && e.getClickedBlock() != null && (MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) && e.getClickedBlock().getWorld().getName().equals("world") + && e.getPlayer().getGameMode() != GameMode.CREATIVE )) // If so, cancel the interaction. { e.setCancelled(true); From cf352dc498e002ce8413b05a66b5449431e4b40b Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:44:38 -0500 Subject: [PATCH 04/12] Changing how we identify whether the item is a trapdoor. --- .../disabletrapdoorflipping/TrapdoorListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index 9bfe210..143ae13 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -1,6 +1,7 @@ package me.ShermansWorld.AlathraExtras.disabletrapdoorflipping; import com.destroystokyo.paper.MaterialTags; +import me.ShermansWorld.AlathraExtras.AlathraExtras; import org.bukkit.GameMode; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -21,11 +22,12 @@ public void onInteract(PlayerInteractEvent e) { // Checks if the action is right click, and the right click is at a block. if(e.getAction() == Action.RIGHT_CLICK_BLOCK && e.getClickedBlock() != null - && (MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) + && e.getClickedBlock().getType().toString().toLowerCase().contains("trapdoor") && e.getClickedBlock().getWorld().getName().equals("world") && e.getPlayer().getGameMode() != GameMode.CREATIVE - )) // If so, cancel the interaction. + ) // If so, cancel the interaction. { + AlathraExtras.logger.log("Test log."); e.setCancelled(true); } } From 23d2735cf2c79a1118c9b298e61261c67b489da1 Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:57:47 -0500 Subject: [PATCH 05/12] Registering the trapdoor listener. --- src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java | 2 ++ .../AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java b/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java index 2232421..5fcb846 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java @@ -7,6 +7,7 @@ import me.ShermansWorld.AlathraExtras.crafting.*; import me.ShermansWorld.AlathraExtras.disabledispensereggs.DispenserListener; import me.ShermansWorld.AlathraExtras.disablespawners.DisableSpawners; +import me.ShermansWorld.AlathraExtras.disabletrapdoorflipping.TrapdoorListener; import me.ShermansWorld.AlathraExtras.enderchersblock.EnderChestBlockListener; import me.ShermansWorld.AlathraExtras.endermanexp.EndermanExpDropListener; import me.ShermansWorld.AlathraExtras.funny.AetherPortalListener; @@ -155,6 +156,7 @@ public void onEnable() { this.getServer().getPluginManager().registerEvents(new VotingListener(), this); this.getServer().getPluginManager().registerEvents(new DispenserListener(), this); this.getServer().getPluginManager().registerEvents(new NPCListener(), this); + this.getServer().getPluginManager().registerEvents(new TrapdoorListener(), this); initRecipeItems(); FurnaceRecipes furnaceRecipes = new FurnaceRecipes(); diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index 143ae13..f25c725 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -22,7 +22,7 @@ public void onInteract(PlayerInteractEvent e) { // Checks if the action is right click, and the right click is at a block. if(e.getAction() == Action.RIGHT_CLICK_BLOCK && e.getClickedBlock() != null - && e.getClickedBlock().getType().toString().toLowerCase().contains("trapdoor") + && MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) && e.getClickedBlock().getWorld().getName().equals("world") && e.getPlayer().getGameMode() != GameMode.CREATIVE ) // If so, cancel the interaction. From bfa99ba9e02d7a9137047d42c9cd504831d6ddf4 Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 23:05:18 -0500 Subject: [PATCH 06/12] Removing the test log. --- .../AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index f25c725..b49585b 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -27,7 +27,6 @@ public void onInteract(PlayerInteractEvent e) { && e.getPlayer().getGameMode() != GameMode.CREATIVE ) // If so, cancel the interaction. { - AlathraExtras.logger.log("Test log."); e.setCancelled(true); } } From da8d14f5dde648de3ca4868fba8e864b2eb087a0 Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:19:09 -0500 Subject: [PATCH 07/12] Should disable trapdoor spawning in the spawn. --- .../TrapdoorListener.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java new file mode 100644 index 0000000..f603f11 --- /dev/null +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -0,0 +1,22 @@ +package me.ShermansWorld.AlathraExtras.disabletrapdoorflipping; + +import com.destroystokyo.paper.MaterialTags; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; + +public class TrapdoorListener implements Listener { + @EventHandler + public void onInteract(PlayerInteractEvent e) { + // Checks if the action is right click, and the right click is at a block. + if(e.getAction() == Action.RIGHT_CLICK_BLOCK + && e.getClickedBlock() != null + && (MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) + && e.getClickedBlock().getWorld().getName().equals("world") + )) // If so, cancel the interaction. + { + e.setCancelled(true); + } + } +} From e18a1df19fb5ddd4ca02981cf6e1658cd1293ba9 Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:24:14 -0500 Subject: [PATCH 08/12] Adding some comments --- .../disabletrapdoorflipping/TrapdoorListener.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index f603f11..a95f510 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -6,7 +6,15 @@ import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; +/** + * Listens for trapdoor interaction events + */ public class TrapdoorListener implements Listener { + + /** + * Checks for player interactions with a trapdoor. + * @param e the player interaction event + */ @EventHandler public void onInteract(PlayerInteractEvent e) { // Checks if the action is right click, and the right click is at a block. From afbf19b286306723599e4752c108cffae8627735 Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:26:47 -0500 Subject: [PATCH 09/12] Checking that the player isn't in creative. --- .../AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index a95f510..9bfe210 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -1,6 +1,7 @@ package me.ShermansWorld.AlathraExtras.disabletrapdoorflipping; import com.destroystokyo.paper.MaterialTags; +import org.bukkit.GameMode; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; @@ -22,6 +23,7 @@ public void onInteract(PlayerInteractEvent e) { && e.getClickedBlock() != null && (MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) && e.getClickedBlock().getWorld().getName().equals("world") + && e.getPlayer().getGameMode() != GameMode.CREATIVE )) // If so, cancel the interaction. { e.setCancelled(true); From 69eb5302cc11fb547f9cefb4e787005feced632f Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:44:38 -0500 Subject: [PATCH 10/12] Changing how we identify whether the item is a trapdoor. --- .../disabletrapdoorflipping/TrapdoorListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index 9bfe210..143ae13 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -1,6 +1,7 @@ package me.ShermansWorld.AlathraExtras.disabletrapdoorflipping; import com.destroystokyo.paper.MaterialTags; +import me.ShermansWorld.AlathraExtras.AlathraExtras; import org.bukkit.GameMode; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -21,11 +22,12 @@ public void onInteract(PlayerInteractEvent e) { // Checks if the action is right click, and the right click is at a block. if(e.getAction() == Action.RIGHT_CLICK_BLOCK && e.getClickedBlock() != null - && (MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) + && e.getClickedBlock().getType().toString().toLowerCase().contains("trapdoor") && e.getClickedBlock().getWorld().getName().equals("world") && e.getPlayer().getGameMode() != GameMode.CREATIVE - )) // If so, cancel the interaction. + ) // If so, cancel the interaction. { + AlathraExtras.logger.log("Test log."); e.setCancelled(true); } } From 4fb345dc45993c6ba3941163b3c97b9fca78f76f Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 22:57:47 -0500 Subject: [PATCH 11/12] Registering the trapdoor listener. --- src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java | 2 ++ .../AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java b/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java index 2232421..5fcb846 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/AlathraExtras.java @@ -7,6 +7,7 @@ import me.ShermansWorld.AlathraExtras.crafting.*; import me.ShermansWorld.AlathraExtras.disabledispensereggs.DispenserListener; import me.ShermansWorld.AlathraExtras.disablespawners.DisableSpawners; +import me.ShermansWorld.AlathraExtras.disabletrapdoorflipping.TrapdoorListener; import me.ShermansWorld.AlathraExtras.enderchersblock.EnderChestBlockListener; import me.ShermansWorld.AlathraExtras.endermanexp.EndermanExpDropListener; import me.ShermansWorld.AlathraExtras.funny.AetherPortalListener; @@ -155,6 +156,7 @@ public void onEnable() { this.getServer().getPluginManager().registerEvents(new VotingListener(), this); this.getServer().getPluginManager().registerEvents(new DispenserListener(), this); this.getServer().getPluginManager().registerEvents(new NPCListener(), this); + this.getServer().getPluginManager().registerEvents(new TrapdoorListener(), this); initRecipeItems(); FurnaceRecipes furnaceRecipes = new FurnaceRecipes(); diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index 143ae13..f25c725 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -22,7 +22,7 @@ public void onInteract(PlayerInteractEvent e) { // Checks if the action is right click, and the right click is at a block. if(e.getAction() == Action.RIGHT_CLICK_BLOCK && e.getClickedBlock() != null - && e.getClickedBlock().getType().toString().toLowerCase().contains("trapdoor") + && MaterialTags.TRAPDOORS.isTagged(e.getClickedBlock().getType()) && e.getClickedBlock().getWorld().getName().equals("world") && e.getPlayer().getGameMode() != GameMode.CREATIVE ) // If so, cancel the interaction. From d60e487d3b30f7f673f45cfb754f77fe893fab59 Mon Sep 17 00:00:00 2001 From: Xavier Beatrice Date: Wed, 14 Feb 2024 23:05:18 -0500 Subject: [PATCH 12/12] Removing the test log. --- .../AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java index f25c725..b49585b 100644 --- a/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java +++ b/src/main/java/me/ShermansWorld/AlathraExtras/disabletrapdoorflipping/TrapdoorListener.java @@ -27,7 +27,6 @@ public void onInteract(PlayerInteractEvent e) { && e.getPlayer().getGameMode() != GameMode.CREATIVE ) // If so, cancel the interaction. { - AlathraExtras.logger.log("Test log."); e.setCancelled(true); } }