Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-16 21:10:17 +01:00
Code Issues Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EvilSeph 2011-06-23 01:08:56 -04:00
Ursprung 98098481e9
Commit ebfd973d09
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
src/main/java/net/minecraft/server/EntityItem.java
Datei anzeigen

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