ef170ee659
--- work/Bukkit Submodule work/Bukkit 6eac6d70..1ef8b9d9: > Add Player#openBook(ItemStack) method --- work/CraftBukkit Submodule work/CraftBukkit 17543ecf..649921e5: > Add Player#openBook(ItemStack) method > SPIGOT-2000: Picking up items to shield slot working inconsistently when inventory is full > SPIGOT-5037: Player.openMerchant does not show merchant level > SPIGOT-5038: Inventory.getHolder returns null for wandering traders --- work/Spigot Submodule work/Spigot baafee91..df0eb250: > SPIGOT-5043: Desync if world is changed in PlayerSpawnLocationEvent > Rebuild patches Implementation developer note: This patch adds a "pre-source" patch system for fixing malformed patches from upstream directly. This seems to keep happening so it's best we have some way to deal with them. This system brings those issues into our domain rather than needing to wait for upstream to fix their malformed files.
21 Zeilen
854 B
Diff
21 Zeilen
854 B
Diff
--- 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) {
|