Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

1.15.2 - Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
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

Bukkit Changes:
149527f7 SPIGOT-5782: Set Arrow Launched From Crossbow

CraftBukkit Changes:
be6aaf04 SPIGOT-5782: Set Arrow Launched From Crossbow
833da9c4 SPIGOT-5799: InventoryCloseEvent fires after PlayerQuitEvent
26c0084f SPIGOT-5675, SPIGOT-5798, MC-149563: Fix tracking of entities across dimensions
7f3e7c3f SPIGOT-5797: Zombie(Villagers) Instant Convert based on their lifetime
This commit is contained in:
Aikar
2020-06-23 20:25:28 -04:00
parent 70df8f2716
commit ec9fa36908
17 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index aecd5011cbe8c6f78be436084621f4c31cdac23a..24594aa0e9b8741811acfc9f84f4db7552832bd2 100644
index 0a31f2e931bba74ecda40c3792718a530acec3af..576c9c6ae4339951d4ec9fffa69c7f860d82b33f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2896,10 +2896,13 @@ public abstract class EntityLiving extends Entity {
@@ -2897,10 +2897,13 @@ public abstract class EntityLiving extends Entity {
this.datawatcher.set(EntityLiving.ao, (byte) j);
}
@@ -24,7 +24,7 @@ index aecd5011cbe8c6f78be436084621f4c31cdac23a..24594aa0e9b8741811acfc9f84f4db75
this.activeItem = itemstack;
this.bl = itemstack.k();
if (!this.world.isClientSide) {
@@ -2975,6 +2978,7 @@ public abstract class EntityLiving extends Entity {
@@ -2976,6 +2979,7 @@ public abstract class EntityLiving extends Entity {
this.clearActiveItem();
} else {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@@ -32,7 +32,7 @@ index aecd5011cbe8c6f78be436084621f4c31cdac23a..24594aa0e9b8741811acfc9f84f4db75
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -3005,8 +3009,8 @@ public abstract class EntityLiving extends Entity {
@@ -3006,8 +3010,8 @@ public abstract class EntityLiving extends Entity {
this.a(this.getRaisedHand(), itemstack);
// CraftBukkit end
this.dH();