Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,22 @@ public class InventoryPlayer implements IInventory {
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() {
for (int i = 0; i < this.items.length; ++i) {
if (this.items[i] == null) {