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

Fix the case of SlimefunItem#itemhandlers

Browse Source
This commit is contained in:
JustAHuman-xD 2023-11-18 19:18:04 -06:00 committed by GitHub
parent 563ebec856
commit f48665da6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java
View File

@ -109,7 +109,7 @@ public class SlimefunItem implements Placeable {
private Optional<String> wikiURL = Optional.empty(); private Optional<String> wikiURL = Optional.empty();
private final OptionalMap<Class<? extends ItemHandler>, ItemHandler> itemhandlers = new OptionalMap<>(HashMap::new); private final OptionalMap<Class<? extends ItemHandler>, ItemHandler> itemHandlers = new OptionalMap<>(HashMap::new);
private final Set<ItemSetting<?>> itemSettings = new HashSet<>(); private final Set<ItemSetting<?>> itemSettings = new HashSet<>();
private boolean ticking = false; private boolean ticking = false;
@ -477,12 +477,12 @@ public class SlimefunItem implements Placeable {
onEnable(); onEnable();
} else { } else {
// Clear item handlers if we are disabled so that calling them isn't possible later on // Clear item handlers if we are disabled so that calling them isn't possible later on
for (ItemHandler handler : this.itemhandlers.values()) { for (ItemHandler handler : this.itemHandlers.values()) {
if (handler instanceof BlockTicker) { if (handler instanceof BlockTicker) {
Slimefun.getRegistry().getTickerBlocks().remove(getId()); Slimefun.getRegistry().getTickerBlocks().remove(getId());
} }
} }
this.itemhandlers.clear(); this.itemHandlers.clear();
} }
// Lock the SlimefunItemStack from any accidental manipulations // Lock the SlimefunItemStack from any accidental manipulations
@ -540,7 +540,7 @@ public class SlimefunItem implements Placeable {
} }
private void loadItemHandlers() { private void loadItemHandlers() {
for (ItemHandler handler : itemhandlers.values()) { for (ItemHandler handler : itemHandlers.values()) {
Optional<IncompatibleItemHandlerException> exception = handler.validate(this); Optional<IncompatibleItemHandlerException> exception = handler.validate(this);
// Check if the validation caused an exception. // Check if the validation caused an exception.
@ -802,7 +802,7 @@ public class SlimefunItem implements Placeable {
} }
for (ItemHandler handler : handlers) { for (ItemHandler handler : handlers) {
itemhandlers.put(handler.getIdentifier(), handler); itemHandlers.put(handler.getIdentifier(), handler);
// Tickers are a special case (at the moment at least) // Tickers are a special case (at the moment at least)
if (handler instanceof BlockTicker ticker) { if (handler instanceof BlockTicker ticker) {
@ -914,7 +914,7 @@ public class SlimefunItem implements Placeable {
* @return The Set of item handlers * @return The Set of item handlers
*/ */
public @Nonnull Collection<ItemHandler> getHandlers() { public @Nonnull Collection<ItemHandler> getHandlers() {
return itemhandlers.values(); return itemHandlers.values();
} }
/** /**
@ -932,7 +932,7 @@ public class SlimefunItem implements Placeable {
*/ */
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public <T extends ItemHandler> boolean callItemHandler(Class<T> c, Consumer<T> callable) { public <T extends ItemHandler> boolean callItemHandler(Class<T> c, Consumer<T> callable) {
Optional<ItemHandler> handler = itemhandlers.get(c); Optional<ItemHandler> handler = itemHandlers.get(c);
if (handler.isPresent()) { if (handler.isPresent()) {
try { try {