twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed PlayerPickupItem event returning wrong amount picked up and added function to get the amount remaining on the ground.

Browse Source
This commit is contained in:
EvilSeph
2011-07-02 14:05:31 -04:00
parent 22097a9962
commit f7e17b68de
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraft/server/EntityItem.java
View File

@@ -124,9 +124,13 @@ public class EntityItem extends Entity {
int i = this.itemStack.count;
// CraftBukkit start
if (this.pickupDelay <= 0 && entityhuman.inventory.canHold(this.itemStack) > 0) {
PlayerPickupItemEvent event = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity());
int canHold = entityhuman.inventory.canHold(this.itemStack);
int remaining = this.itemStack.count - canHold;
if (this.pickupDelay <= 0 && canHold > 0) {
this.itemStack.count = canHold;
PlayerPickupItemEvent event = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
this.world.getServer().getPluginManager().callEvent(event);
this.itemStack.count = canHold + remaining;
if (event.isCancelled()) {
return;