From e7e4de857ddfb3896783161e827099584a9ddf9d Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Tue, 14 Sep 2021 12:58:23 +0300 Subject: [PATCH] Fixed WatcherTriggers not being registered --- build.gradle | 10 +++++++++- .../main/java/com/willfp/reforges/ReforgesPlugin.java | 4 +++- .../willfp/reforges/reforges/util/WatcherTriggers.java | 5 +---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index b6bed22..39ce0e7 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,15 @@ shadowJar { } jar { - archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" + archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" +} + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } } group = 'com.willfp' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java index 470dd36..9c706f7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/ReforgesPlugin.java @@ -10,6 +10,7 @@ import com.willfp.reforges.display.ReforgesDisplay; import com.willfp.reforges.reforges.Reforge; import com.willfp.reforges.reforges.Reforges; import com.willfp.reforges.reforges.util.ReforgeArgParser; +import com.willfp.reforges.reforges.util.WatcherTriggers; import com.willfp.reforges.util.AntiPlaceListener; import com.willfp.reforges.util.DiscoverRecipeListener; import com.willfp.reforges.vault.EconomyHandler; @@ -67,7 +68,8 @@ public class ReforgesPlugin extends EcoPlugin { protected List loadListeners() { return Arrays.asList( new DiscoverRecipeListener(this), - new AntiPlaceListener(this) + new AntiPlaceListener(this), + new WatcherTriggers(this) ); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/WatcherTriggers.java index 101fb4f..5796b62 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/WatcherTriggers.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/WatcherTriggers.java @@ -44,6 +44,7 @@ public class WatcherTriggers extends PluginDependent implements Liste */ @EventHandler(ignoreCancelled = true) public void onBlockBreak(@NotNull final BlockBreakEvent event) { + if (McmmoManager.isFake(event)) { return; } @@ -55,10 +56,6 @@ public class WatcherTriggers extends PluginDependent implements Liste return; } - if (event.isCancelled()) { - return; - } - ItemStack itemStack = player.getInventory().getItemInMainHand(); Reforge reforge = ReforgeUtils.getReforge(itemStack);