mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #2179

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-08-02 21:45:58 +02:00
parent b26f2a1ca8
commit d20650855c
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -35,6 +35,7 @@
* Fixed #2176 * Fixed #2176
* Fixed #2164 * Fixed #2164
* Fixed #2147 * Fixed #2147
* Fixed #2179
## Release Candidate 15 (01 Aug 2020) ## Release Candidate 15 (01 Aug 2020)

12
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
View File

@ -501,6 +501,12 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon {
} }
} }
/**
* This returns the global instance of {@link SlimefunPlugin}.
* This may return null if the {@link Plugin} was disabled.
*
* @return The {@link SlimefunPlugin} instance
*/
public static SlimefunPlugin instance() { public static SlimefunPlugin instance() {
return instance; return instance;
} }
@ -650,6 +656,12 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon {
return instance.command; return instance.command;
} }
/**
* This returns our instance of the {@link SlimefunProfiler}, a tool that is used
* to analyse performance and lag.
*
* @return The {@link SlimefunProfiler}
*/
public static SlimefunProfiler getProfiler() { public static SlimefunProfiler getProfiler() {
return instance.profiler; return instance.profiler;
} }

15
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiTool.java
View File

@ -11,8 +11,8 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable; import io.github.thebusybiscuit.slimefun4.core.attributes.Rechargeable;
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler;
import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler; import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler;
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.Category;
@ -85,15 +85,8 @@ public class MultiTool extends SlimefunItem implements Rechargeable {
return index; return index;
} }
private BlockBreakHandler getBlockBreakHandler() { private ToolUseHandler getToolUseHandler() {
return (e, item, fortune, drops) -> { return (e, tool, fortune, drops) -> e.setCancelled(true);
if (isItem(item)) {
e.setCancelled(true);
return true;
}
return false;
};
} }
@Override @Override
@ -101,7 +94,7 @@ public class MultiTool extends SlimefunItem implements Rechargeable {
super.preRegister(); super.preRegister();
addItemHandler(getItemUseHandler()); addItemHandler(getItemUseHandler());
addItemHandler(getBlockBreakHandler()); addItemHandler(getToolUseHandler());
} }
} }