Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
0309d17d Rebuild patches
This commit is contained in:
Shane Freeder 2019-06-10 01:29:02 +01:00
parent 6f2c8a6449
commit 60aa918c76
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
3 changed files with 1 additions and 50 deletions

@ -1 +1 @@
Subproject commit 649921e5ba088edd698f37e42b11b11c571c15a0
Subproject commit 0309d17dcc2aabfedeb73adf812194ba4a302b39

View file

@ -1,20 +0,0 @@
--- work/CraftBukkit/nms-patches/EntityItem.patch 2019-06-08 15:17:36.374050325 -0500
+++ work/CraftBukkit/nms-patches/EntityItem.patch 2019-06-08 15:17:36.374050325 -0500
@@ -97,7 +97,7 @@
this.velocityChanged();
this.f = (int) ((float) this.f - f);
if (this.f <= 0) {
-@@ -267,6 +289,35 @@
+@@ -267,6 +289,38 @@
Item item = itemstack.getItem();
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)) {
entityhuman.receive(this, i);
if (itemstack.isEmpty()) {
-@@ -309,7 +360,9 @@
+@@ -309,7 +363,9 @@
}
public void setItemStack(ItemStack itemstack) {

View file

@ -1,29 +0,0 @@
--- work/CraftBukkit/nms-patches/PlayerInventory.patch 2019-06-08 15:17:36.377383665 -0500
+++ work/CraftBukkit/nms-patches/PlayerInventory.patch 2019-06-08 15:17:36.377383665 -0500
@@ -69,7 +69,7 @@
public PlayerInventory(EntityHuman entityhuman) {
this.items = NonNullList.a(36, 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);
}
@@ -98,7 +98,7 @@
public int getFirstEmptySlotIndex() {
for (int i = 0; i < this.items.size(); ++i) {
if (((ItemStack) this.items.get(i)).isEmpty()) {
-@@ -513,8 +584,9 @@
+@@ -513,8 +590,9 @@
ItemStack itemstack = (ItemStack) this.armor.get(i);
if (itemstack.getItem() instanceof ItemArmor) {
@@ -109,7 +109,7 @@
});
}
}
-@@ -550,6 +622,11 @@
+@@ -550,6 +628,11 @@
}
public ItemStack getCarried() {