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 infused hopper picking up items with pickup delay Short.MAX_VALUE

Browse Source
This commit is contained in:
Daniel Walsh 2021-01-16 10:26:22 +00:00
parent a810458345
commit da2419d414
No known key found for this signature in database
GPG Key ID: 91C6D8D7C4011D82
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/SlimefunCommand.java
View File

@ -83,7 +83,7 @@ public class SlimefunCommand implements CommandExecutor, Listener {
sendHelp(sender);
/**
/*
* We could just return true here, but if there's no subcommands,
* then something went horribly wrong anyway.
* This will also stop sonarcloud from nagging about

17
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java
View File

@ -28,13 +28,11 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
/**
* The {@link InfusedHopper} is a special kind of {@link Hopper} which teleports any
* neaby {@link Item} to itself.
* nearby {@link Item} to itself.
* The radius can be configured in the config.
*
* @author TheBusyBiscuit
*
* @see InfusedMagnet
*
* @author TheBusyBiscuit
* @see InfusedMagnet
*/
public class InfusedHopper extends SimpleSlimefunItem<BlockTicker> {
@ -65,7 +63,7 @@ public class InfusedHopper extends SimpleSlimefunItem<BlockTicker> {
if (toggleable.getValue()) {
Hopper hopper = (Hopper) b.getBlockData();
/**
/*
* If the Hopper was disabled by a redstone signal,
* we just don't do anything.
*/
@ -85,7 +83,7 @@ public class InfusedHopper extends SimpleSlimefunItem<BlockTicker> {
playSound = true;
}
/**
/*
* Play a sound if at least one item was teleported and
* the "silent" setting is set to false.
*/
@ -104,7 +102,10 @@ public class InfusedHopper extends SimpleSlimefunItem<BlockTicker> {
private boolean isValidItem(@Nonnull Location l, @Nonnull Entity entity) {
if (entity instanceof Item && entity.isValid()) {
Item item = (Item) entity;
return !SlimefunUtils.hasNoPickupFlag(item) && item.getLocation().distanceSquared(l) > 0.25;
// Check if the item cannot be picked up or has the "no pickup" metadata
return item.getPickupDelay() != Short.MAX_VALUE
&& !SlimefunUtils.hasNoPickupFlag(item)
&& item.getLocation().distanceSquared(l) > 0.25;
}
return false;