Update to Minecraft 1.15.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-01-22 08:00:00 +11:00
parent 09a2fa4d96
commit 77b64e0c78
50 changed files with 293 additions and 421 deletions

View File

@@ -21,7 +21,7 @@
+ // CraftBukkit - moved down
+ /*
itemstack.damage(1, entityhuman, (entityhuman1) -> {
entityhuman1.d(entityliving.getRaisedHand());
entityhuman1.broadcastItemBreak(entityliving.getRaisedHand());
});
+ */
if (k == 0) {
@@ -41,7 +41,7 @@
+ }
+
+ itemstack.damage(1, entityhuman, (entityhuman1) -> {
+ entityhuman1.d(entityliving.getRaisedHand());
+ entityhuman1.broadcastItemBreak(entityliving.getRaisedHand());
+ });
+ entitythrowntrident.trident = itemstack.cloneItemStack(); // SPIGOT-4511 update since damage call moved
+ // CraftBukkit end
@@ -54,7 +54,7 @@
+ // CraftBukkit start - SPIGOT-5458 also need in this branch :(
+ else {
+ itemstack.damage(1, entityhuman, (entityhuman1) -> {
+ entityhuman1.d(entityliving.getRaisedHand());
+ entityhuman1.broadcastItemBreak(entityliving.getRaisedHand());
+ });
+ }
+ // CraftBukkkit end