Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a70924789 [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
d1db107 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2020-12-22 16:07:10 -06:00
parent 79d304ff80
commit 8cabaaeced
28 changed files with 116 additions and 70 deletions

View File

@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7e01482f9 100644
index df01083f826463cce714eccd5317791c781f04ed..d27124959e4527cc7bfa1b38b8d9f5c56894a617 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -174,7 +174,7 @@ index dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1207,7 +1215,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1237,7 +1245,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
flag1 = true;
@@ -183,7 +183,7 @@ index dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1246,6 +1254,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1276,6 +1284,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();