Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 11:38:29 +01:00
Code Issues Projects Releases Wiki Activity

Fixed PlayerPickupItem event firing even if the player could not pick up the item.

Browse Source
This commit is contained in:
EvilSeph 2011-06-23 01:08:56 -04:00
parent 98098481e9
commit ebfd973d09
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,12 +127,12 @@ public class EntityItem extends Entity {
int i = this.itemStack.count;
// CraftBukkit start
if (this.pickupDelay <= 0) { // <-- == to <=
if (this.pickupDelay <= 0 && entityhuman.inventory.canHold(this.itemStack)) { // <-- == to <=
Player player = (Player) entityhuman.getBukkitEntity();
PlayerPickupItemEvent event = new PlayerPickupItemEvent(player, (org.bukkit.entity.Item) this.getBukkitEntity());
((WorldServer) world).getServer().getPluginManager().callEvent(event);
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled() || !entityhuman.inventory.canHold(this.itemStack)) {
if (event.isCancelled()) {
return;
}
// CraftBukkit end