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

Rebuild patches

Browse Source
This commit is contained in:
md_5 2019-06-09 08:49:28 +10:00
parent 649921e5ba
commit 0309d17dcc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nms-patches/EntityItem.patch
View File

@ -97,7 +97,7 @@
this.velocityChanged(); this.velocityChanged();
this.f = (int) ((float) this.f - f); this.f = (int) ((float) this.f - f);
if (this.f <= 0) { if (this.f <= 0) {
@@ -267,6 +289,35 @@ @@ -267,6 +289,38 @@
Item item = itemstack.getItem(); Item item = itemstack.getItem();
int i = itemstack.getCount(); int i = itemstack.getCount();
@ -136,7 +136,7 @@
if (this.pickupDelay == 0 && (this.owner == null || 6000 - this.age <= 200 || this.owner.equals(entityhuman.getUniqueID())) && entityhuman.inventory.pickup(itemstack)) { if (this.pickupDelay == 0 && (this.owner == null || 6000 - this.age <= 200 || this.owner.equals(entityhuman.getUniqueID())) && entityhuman.inventory.pickup(itemstack)) {
entityhuman.receive(this, i); entityhuman.receive(this, i);
if (itemstack.isEmpty()) { if (itemstack.isEmpty()) {
@@ -309,7 +360,9 @@ @@ -309,7 +363,9 @@
} }
public void setItemStack(ItemStack itemstack) { public void setItemStack(ItemStack itemstack) {

6
nms-patches/PlayerInventory.patch
View File

@ -69,7 +69,7 @@
public PlayerInventory(EntityHuman entityhuman) { public PlayerInventory(EntityHuman entityhuman) {
this.items = NonNullList.a(36, ItemStack.a); this.items = NonNullList.a(36, ItemStack.a);
this.armor = NonNullList.a(4, ItemStack.a); this.armor = NonNullList.a(4, ItemStack.a);
@@ -41,6 +96,22 @@ @@ -41,6 +96,28 @@
return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1); return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1);
} }
@ -98,7 +98,7 @@
public int getFirstEmptySlotIndex() { public int getFirstEmptySlotIndex() {
for (int i = 0; i < this.items.size(); ++i) { for (int i = 0; i < this.items.size(); ++i) {
if (((ItemStack) this.items.get(i)).isEmpty()) { if (((ItemStack) this.items.get(i)).isEmpty()) {
@@ -513,8 +584,9 @@ @@ -513,8 +590,9 @@
ItemStack itemstack = (ItemStack) this.armor.get(i); ItemStack itemstack = (ItemStack) this.armor.get(i);
if (itemstack.getItem() instanceof ItemArmor) { if (itemstack.getItem() instanceof ItemArmor) {
@ -109,7 +109,7 @@
}); });
} }
} }
@@ -550,6 +622,11 @@ @@ -550,6 +628,11 @@
} }
public ItemStack getCarried() { public ItemStack getCarried() {