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

Fixed cancelling the PlayerPickup event, getAmount(), item duping issue.

Browse Source
This commit is contained in:
Erik Broes 2011-06-26 10:53:45 +02:00 committed by EvilSeph
parent b4c0492b15
commit f0402d9d6c
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,16 +127,20 @@ public class EntityItem extends Entity {
int i = this.itemStack.count; int i = this.itemStack.count;
// CraftBukkit start // CraftBukkit start
if (this.pickupDelay <= 0 && entityhuman.inventory.canHold(this.itemStack)) { // <-- == to <= if (this.pickupDelay <= 0 && entityhuman.inventory.canPickup(this.itemStack) > 0) {
Player player = (Player) entityhuman.getBukkitEntity(); PlayerPickupItemEvent event = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity());
PlayerPickupItemEvent event = new PlayerPickupItemEvent(player, (org.bukkit.entity.Item) this.getBukkitEntity()); this.world.getServer().getPluginManager().callEvent(event);
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
// Possibly < 0; fix here so we do not have to modify code below
this.pickupDelay = 0;
}
// CraftBukkit end // CraftBukkit end
if (this.pickupDelay == 0 && entityhuman.inventory.canHold(this.itemStack)) {
if (this.itemStack.id == Block.LOG.id) { if (this.itemStack.id == Block.LOG.id) {
entityhuman.a((Statistic) AchievementList.g); entityhuman.a((Statistic) AchievementList.g);
} }

16
src/main/java/net/minecraft/server/InventoryPlayer.java
View File

@ -51,6 +51,22 @@ public class InventoryPlayer implements IInventory {
return -1; return -1;
} }
// CraftBukkit start - watch method above! :D
public int canPickup(ItemStack itemstack) {
int remains = itemstack.count;
for (int i = 0; i < this.items.length; ++i) {
if (this.items[i] == null) return itemstack.count;
// Taken from d(ItemStack)I
if (this.items[i] != null && this.items[i].id == itemstack.id && this.items[i].c() && this.items[i].count < this.items[i].b() && this.items[i].count < this.getMaxStackSize() && (!this.items[i].e() || this.items[i].getData() == itemstack.getData())) {
remains -= (this.items[i].b() < this.getMaxStackSize() ? this.items[i].b() : this.getMaxStackSize()) - this.items[i].count;
}
if (remains <= 0) return itemstack.count;
}
return itemstack.count - remains;
}
// CraftBukkit end
private int k() { private int k() {
for (int i = 0; i < this.items.length; ++i) { for (int i = 0; i < this.items.length; ++i) {
if (this.items[i] == null) { if (this.items[i] == null) {