Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b91d964b1 Restore Pathfinder Optimizations from 1.15.2
adadf1654 Drop syncPosition on teleportation patch
This commit is contained in:
William Blake Galbreath
2020-08-06 23:44:17 -05:00
parent d6d9539cd2
commit a55a51bf42
10 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -4241,7 +4241,7 @@ index 03a79ff992..d59ef07e1c 100644
// Paper end - optimised tracker
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 84b9c31cc1..82a5658425 100644
index 6259ff4a57..ddb56ffd2b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -322,19 +322,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -4287,7 +4287,7 @@ index 84b9c31cc1..82a5658425 100644
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -976,7 +983,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -975,7 +982,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -4296,7 +4296,7 @@ index 84b9c31cc1..82a5658425 100644
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1000,7 +1007,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -999,7 +1006,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
double d2 = this.player.locZ();
double d3 = this.player.locY();
double d4 = packetplayinflying.a(this.player.locX());double toX = d4; // Paper - OBFHELPER
@@ -4305,7 +4305,7 @@ index 84b9c31cc1..82a5658425 100644
double d6 = packetplayinflying.c(this.player.locZ());double toZ = d6; // Paper - OBFHELPER
float f = packetplayinflying.a(this.player.yaw);
float f1 = packetplayinflying.b(this.player.pitch);
@@ -1008,7 +1015,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1007,7 +1014,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
double d8 = d5 - this.m;
double d9 = d6 - this.n;
double d10 = this.player.getMot().g();
@@ -4319,7 +4319,7 @@ index 84b9c31cc1..82a5658425 100644
if (this.player.isSleeping()) {
if (d11 > 1.0D) {
@@ -1041,7 +1053,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1040,7 +1052,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -4328,7 +4328,7 @@ index 84b9c31cc1..82a5658425 100644
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1097,6 +1109,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1096,6 +1108,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -4336,7 +4336,7 @@ index 84b9c31cc1..82a5658425 100644
this.player.c(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1121,7 +1134,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1120,7 +1133,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.setLocation(d4, d5, d6, f, f1);