mirror of
https://github.com/Auxilor/Reforges.git
synced 2025-12-22 16:39:34 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
10
build.gradle
10
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'
|
||||
|
||||
@@ -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<Listener> loadListeners() {
|
||||
return Arrays.asList(
|
||||
new DiscoverRecipeListener(this),
|
||||
new AntiPlaceListener(this)
|
||||
new AntiPlaceListener(this),
|
||||
new WatcherTriggers(this)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@ public class WatcherTriggers extends PluginDependent<EcoPlugin> 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<EcoPlugin> implements Liste
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.isCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack itemStack = player.getInventory().getItemInMainHand();
|
||||
|
||||
Reforge reforge = ReforgeUtils.getReforge(itemStack);
|
||||
|
||||
Reference in New Issue
Block a user