Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
0ea308381 Updated Upstream (Bukkit/CraftBukkit)

Tuinity Changes:
502d57ba Updated Upstream (Paper)
4415b59b Improve behavior for hard colliding entities
e5f54a3f Fix chunks refusing to unload at low TPS
2dfd22e4 Fix incorrect isRealPlayer init
This commit is contained in:
jmp
2021-02-16 15:19:26 -08:00
parent d7d72b326c
commit 70ec0e2e48
26 changed files with 851 additions and 739 deletions

View File

@@ -92,10 +92,10 @@ index 21f94651fcb47103b12806d456417882e7f84dcd..16a1e55bd01d0616ff04da6b1eb3e7f4
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ffccdc3bf1d28836f4fc2772ebfde843415ea232..8932f4854d9fc52fb2ec66a748e640dfd8806461 100644
index 67fa3bd958876abc39c46d9e517551836b0e86ed..94353290087df17e441dba8fe8999ad558652cda 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2271,6 +2271,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2296,6 +2296,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;