GabrielTofvesson/SpigotInvTweaks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stack clearing bug for throwable projectiles

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-05-20 01:25:01 +02:00
parent c94f56f0ac
commit 8b2947e312
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dev/w1zzrd/invtweaks/InvTweaksPlugin.java
View File

@ -98,7 +98,7 @@ public final class InvTweaksPlugin extends JavaPlugin {
private void initEvents() {
final PluginManager pluginManager = getServer().getPluginManager();
pluginManager.registerEvents(new StackReplaceListener(), this);
pluginManager.registerEvents(new StackReplaceListener(this), this);
pluginManager.registerEvents(new SortListener(), this);
pluginManager.registerEvents(new MagnetismListener(magnetCommandExecutor), this);
pluginManager.registerEvents(new TabCompletionListener(), this);

18
src/dev/w1zzrd/invtweaks/listener/StackReplaceListener.java
View File

@ -12,6 +12,7 @@ import org.bukkit.event.player.PlayerItemBreakEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.plugin.Plugin;
import java.util.logging.Logger;
@ -22,6 +23,12 @@ import static dev.w1zzrd.invtweaks.InvTweaksPlugin.LOG_PLUGIN_NAME;
*/
public class StackReplaceListener implements Listener {
private final Plugin plugin;
public StackReplaceListener(final Plugin plugin) {
this.plugin = plugin;
}
/**
* Max index for main player inventory
*/
@ -73,9 +80,14 @@ public class StackReplaceListener implements Listener {
slot = EquipmentSlot.OFF_HAND;
else return;
if (inventory.getItem(slot).getAmount() == 1 &&
findAndMoveSimilarStack(stack, slot, inventory, CompareFunc.defaultFunc()))
logger.fine(LOG_PLUGIN_NAME + " Moved snowball into empty hand for player " + thrower.getName());
if (inventory.getItem(slot).getAmount() == 1)
Bukkit.getScheduler().runTaskLater(
plugin,
() -> {
if (findAndMoveSimilarStack(stack, slot, inventory, CompareFunc.defaultFunc()))
logger.fine(LOG_PLUGIN_NAME + " Moved snowball into empty hand for player " + thrower.getName());
},
1);
}
}