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:
5486b3db Fix javadocs failing jenkins builds (#4189)
1330eb5f Brand support
This commit is contained in:
William Blake Galbreath
2020-08-23 20:39:32 -05:00
parent 79b0a9b0e7
commit 6ee7cbceeb
14 changed files with 51 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4222,10 +4222,10 @@ index 8a069cfcb..66d6c15ab 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 bc613281d..d32f423c5 100644
index 250ae81b8..b44038534 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 {
@@ -325,19 +325,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (entity != this.player && entity.getRidingPassenger() == this.player && entity == this.r) {
WorldServer worldserver = this.player.getWorldServer();
@@ -4257,7 +4257,7 @@ index bc613281d..d32f423c5 100644
// CraftBukkit start - handle custom speeds and skipped ticks
@@ -363,7 +368,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -366,7 +371,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
@@ -4268,7 +4268,7 @@ index bc613281d..d32f423c5 100644
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -969,7 +976,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -972,7 +979,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -4277,7 +4277,7 @@ index bc613281d..d32f423c5 100644
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -993,7 +1000,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -996,7 +1003,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
@@ -4286,7 +4286,7 @@ index bc613281d..d32f423c5 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);
@@ -1001,7 +1008,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1004,7 +1011,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
double d8 = d5 - this.m;
double d9 = d6 - this.n;
double d10 = this.player.getMot().g();
@@ -4300,7 +4300,7 @@ index bc613281d..d32f423c5 100644
if (this.player.isSleeping()) {
if (d11 > 1.0D) {
@@ -1034,7 +1046,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1037,7 +1049,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -4309,7 +4309,7 @@ index bc613281d..d32f423c5 100644
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1090,6 +1102,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1093,6 +1105,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -4317,7 +4317,7 @@ index bc613281d..d32f423c5 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) {
@@ -1114,7 +1127,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1117,7 +1130,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.setLocation(d4, d5, d6, f, f1);