From fe637b9572f1dd757b97f35e1dd66be0324df329 Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Mon, 7 Jun 2021 16:47:24 +0200 Subject: [PATCH] Fix Sealing Table Shiftclick #401 & Updated Dependencies --- README.md | 4 ++ pom.xml | 39 ++++++++++++------- src/com/dre/brewery/P.java | 2 +- .../dre/brewery/listeners/PlayerListener.java | 26 +++++++------ 4 files changed, 46 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 6baa118..38f0f7e 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ Find the Project Page on [Spigot](https://www.spigotmc.org/resources/brewery.308 Also see [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases](https://github.com/DieReicheErethons/Brewery/releases) | [Changelog](https://github.com/DieReicheErethons/Brewery/wiki/changelog) | [Commits](https://github.com/DieReicheErethons/Brewery/commits/master) +### JavaDoc + +https://javadoc.jitpack.io/com/github/DieReicheErethons/Brewery/-3166f8c81b-1/javadoc/index.html + ### Maven ```XML diff --git a/pom.xml b/pom.xml index 72e3522..ffd9721 100644 --- a/pom.xml +++ b/pom.xml @@ -161,6 +161,13 @@ + + + org.bstats + bstats-bukkit + 2.2.1 + compile + net.milkbowl.vault VaultAPI @@ -186,9 +193,10 @@ + com.sk89q.worldedit worldedit-bukkit - 7.2.4 + 7.2.5 provided @@ -200,7 +208,7 @@ com.sk89q.worldedit worldedit-core - 7.2.3 + 7.2.5 provided @@ -210,6 +218,7 @@ + com.sk89q.worldguard worldguard-core 7.0.4 @@ -222,6 +231,7 @@ + com.griefcraft.lwc LWCX 2.2.6 @@ -234,15 +244,17 @@ + com.github.TechFortress GriefPrevention 16.17.1 provided + de.diddiz logblock - 1.16.1.1 + 1.16.5.1 provided @@ -252,9 +264,10 @@ + com.github.slimefun Slimefun4 - RC-22 + RC-24 provided + io.lumine MythicLib - 1.0.18 + 1.0.19 provided + com.acrobot.chestshop chestshop - 3.11 + 3.12 provided + com.github.TownyAdvanced Towny - 0.96.3.0 + 0.97.0.0 provided + com.nisovin.shopkeepers ShopkeepersAPI 2.12.0 provided + nl.rutgerkok blocklocker 1.9.2 provided - org.bstats - bstats-bukkit - 2.2.1 - compile - - + org.jetbrains annotations 16.0.2 diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index 725d7ed..ad0c869 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -422,7 +422,7 @@ public class P extends JavaPlugin { } } })); - } catch (Throwable e) { + } catch (Exception | LinkageError e) { e.printStackTrace(); } } diff --git a/src/com/dre/brewery/listeners/PlayerListener.java b/src/com/dre/brewery/listeners/PlayerListener.java index 95b9225..b216132 100644 --- a/src/com/dre/brewery/listeners/PlayerListener.java +++ b/src/com/dre/brewery/listeners/PlayerListener.java @@ -11,6 +11,7 @@ import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.Block; import org.bukkit.entity.Player; +import org.bukkit.event.Event; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -50,19 +51,12 @@ public class PlayerListener implements Listener { return; } - if (player.isSneaking()) return; - - // -- Interacting with a Cauldron -- - if (type == Material.CAULDRON) { - // Handle the Cauldron Interact - // The Event might get cancelled in here - BCauldron.clickCauldron(event); - return; - } - - // -- Opening a Sealing Table -- if (P.use1_14 && BSealer.isBSealer(clickedBlock)) { + if (player.isSneaking()) { + event.setUseInteractedBlock(Event.Result.DENY); + return; + } event.setCancelled(true); if (BConfig.enableSealingTable) { BSealer sealer = new BSealer(player); @@ -73,6 +67,16 @@ public class PlayerListener implements Listener { return; } + if (player.isSneaking()) return; + + // -- Interacting with a Cauldron -- + if (type == Material.CAULDRON) { + // Handle the Cauldron Interact + // The Event might get cancelled in here + BCauldron.clickCauldron(event); + return; + } + // -- Opening a Minecraft Barrel -- if (P.use1_14 && type == Material.BARREL) { if (!player.hasPermission("brewery.openbarrel.mc")) {