Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01: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:
7358bf02 [Auto] Updated Upstream (CraftBukkit/Spigot)
8df6e39b [CI-SKIP] Fix version for groovy artifact (1.16.4) (#4730)
0e73fdbf OBFHELPERS (#4733)
This commit is contained in:
William Blake Galbreath
2020-11-04 13:08:22 -06:00
parent f15d3f0497
commit f0b8bd76a6
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4749,7 +4749,7 @@ index 6c399bcea0..087bbad025 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 17f093213f..490626ecd3 100644
index 563ae7355f..b89caa8ad1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -415,7 +415,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -4763,7 +4763,7 @@ index 17f093213f..490626ecd3 100644
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -1052,7 +1054,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1054,7 +1056,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -4772,7 +4772,7 @@ index 17f093213f..490626ecd3 100644
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1122,7 +1124,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1124,7 +1126,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -4781,7 +4781,7 @@ index 17f093213f..490626ecd3 100644
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1178,6 +1180,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1180,6 +1182,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -4789,7 +4789,7 @@ index 17f093213f..490626ecd3 100644
this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1202,7 +1205,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1204,7 +1207,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.setLocation(d4, d5, d6, f, f1);