Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
3dc82c200 deprecate IllegalPacketEvent (#4867)
This commit is contained in:
BillyGalbreath
2020-12-08 11:07:54 -06:00
parent 69790ff3ff
commit 1b40f871b8
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11142,10 +11142,10 @@ index 6c399bcea0..d3bf356ea7 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 a736d676ef..12ce5b106d 100644
index 0aac84e980..1c8b477f83 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -416,7 +416,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -414,7 +414,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
// Paper start - Prevent moving into unloaded chunks
@@ -11156,7 +11156,7 @@ index a736d676ef..12ce5b106d 100644
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -1055,7 +1057,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1053,7 +1055,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -11165,7 +11165,7 @@ index a736d676ef..12ce5b106d 100644
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1125,7 +1127,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1123,7 +1125,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -11174,7 +11174,7 @@ index a736d676ef..12ce5b106d 100644
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1181,6 +1183,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1179,6 +1181,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -11182,7 +11182,7 @@ index a736d676ef..12ce5b106d 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) {
@@ -1205,7 +1208,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1203,7 +1206,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.setLocation(d4, d5, d6, f, f1);