Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
d5cb9308f fix #5224
d23f8b62e fix? #5222
0f2575de2 fix? #5222
7c3499702 fix? #5218
c8eec830b fix #5217
a235c77ce Adventure 4.5.0
This commit is contained in:
jmp
2021-02-22 04:42:43 -08:00
parent 55af1079b5
commit 274c7b2ccc
15 changed files with 42 additions and 42 deletions

View File

@@ -92,10 +92,10 @@ index 9807441d53fcf4ef7aaffe3801542f5a371eb7af..43cdeaae22bf020d0b3c1e1c56e65e73
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3c63788c7119d1fcd4c08f4e1d6e93da23e50e08..7ffc3c1d41b3b8fdd8f0e48f991f0ae4e1294c53 100644
index fd3c9904afa5eb6175d308ab046801cee7a21297..cdcf02a73d3dffecac3605f0c7438075e5bceac3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2299,6 +2299,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2303,6 +2303,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
PlayerInteractEntityEvent event;