Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-01-05 15:28:00 +01:00
Code Issues Projects Releases Wiki Activity

Not sure why this was done this way.

Browse Source
This commit is contained in:
Brianna 2020-04-05 12:53:05 -04:00
parent cd206b16e1
commit d229e65388
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/songoda/ultimatestacker/listeners/ItemListeners.java
View File

@ -7,6 +7,7 @@ import com.songoda.ultimatestacker.settings.Settings;
import com.songoda.ultimatestacker.utils.Methods; import com.songoda.ultimatestacker.utils.Methods;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -88,18 +89,15 @@ public class ItemListeners implements Listener {
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPickup(PlayerPickupItemEvent event) { public void onPickup(PlayerPickupItemEvent event) {
if (!Settings.STACK_ITEMS.getBoolean()) return; if (!Settings.STACK_ITEMS.getBoolean() || event.getItem() instanceof Arrow) return;
// Amount here is not the total amount of item (32 if more than 32) but the amount of item the player can retrieve // Amount here is not the total amount of item (32 if more than 32) but the amount of item the player can retrieve
// ie there is x64 diamonds blocks (so 32), the player pick 8 items so the amount is 8 and not 32 // ie there is x64 diamonds blocks (so 32), the player pick 8 items so the amount is 8 and not 32
Item item = event.getItem(); Item item = event.getItem();
ItemStack stack = item.getItemStack(); ItemStack stack = item.getItemStack();
int amount = UltimateStacker.getActualItemAmount(item); int amount = UltimateStacker.getActualItemAmount(item);
if (/*event.getItem().getItemStack().getAmount()*/amount < (stack.getMaxStackSize() / 2)) { if (amount < (stack.getMaxStackSize() / 2)) return;
// Update
UltimateStacker.updateItemAmount(item, event.getRemaining());
return;
}
event.getItem().setItemStack(stack); event.getItem().setItemStack(stack);
event.getPlayer().playSound(event.getPlayer().getLocation(), CompatibleSound.ENTITY_ITEM_PICKUP.getSound(), .2f, (float) (1 + Math.random())); event.getPlayer().playSound(event.getPlayer().getLocation(), CompatibleSound.ENTITY_ITEM_PICKUP.getSound(), .2f, (float) (1 + Math.random()));