Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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:
d5cb9308f fix #5224
d23f8b62e fix? #5222
0f2575de2 fix? #5222
7c3499702 fix? #5218
c8eec830b fix #5217
a235c77ce Adventure 4.5.0
This commit is contained in:
jmp
2021-02-22 04:42:43 -08:00
parent 55af1079b5
commit 274c7b2ccc
15 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13756,10 +13756,10 @@ index 49008cdec739b19409fdaf1b0ed806a6c0e93200..61570ab947b5a153a4c2bcb5a09344f0
}
// 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 c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d26708986c1b6e2 100644
index ad33505bb7896dce6c4381b4652316ef734e9e48..9bd88a7a42ede0029b79eae51a4b7acf1db3fc97 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -423,7 +423,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
@@ -13770,7 +13770,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -432,12 +434,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -436,12 +438,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
return;
}
@@ -13786,7 +13786,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
double d11 = d7;
d6 = d3 - entity.locX();
@@ -451,16 +455,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -455,16 +459,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean flag1 = false;
if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
@@ -13816,7 +13816,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
entity.setLocation(d0, d1, d2, f, f1);
player.setLocation(d0, d1, d2, this.player.yaw, this.player.pitch); // CraftBukkit
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
@@ -546,7 +559,32 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -550,7 +563,32 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
private boolean a(Entity entity) {
@@ -13850,7 +13850,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
}
@Override
@@ -1068,7 +1106,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1072,7 +1110,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -13859,7 +13859,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1138,7 +1176,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1142,7 +1180,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -13868,7 +13868,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1155,7 +1193,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1159,7 +1197,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
@@ -13877,7 +13877,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
d7 = d4 - this.o;
d8 = d5 - this.p;
@@ -1194,6 +1232,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1198,6 +1236,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -13885,7 +13885,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1213,12 +1252,23 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1217,12 +1256,23 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean flag1 = false;
if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
@@ -13911,7 +13911,7 @@ index c798eb012ab2ac0aab45d3a0f8c61cd1425d3725..8c8359bb696afb579796b23a4d267089
this.a(d0, d1, d2, f, f1);
} else {
// CraftBukkit start - fire PlayerMoveEvent
@@ -1305,6 +1355,26 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1309,6 +1359,26 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
@@ -14122,7 +14122,7 @@ index 114e986e5132e5e4bb42d0f08a067429bce53ba6..05656ea8448aa569e8dd480461e2d5f7
this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 4a20235f34dc272b0a7939b97cf3448919c4f753..60b2e560bbf4c5303e9334a496c6ced0e3c88b19 100644
index fefe71f95f94cae9e8d3d3de344155b5cd357fff..8e49de2f89aded40d760d57f4ddfcb84f73deb1d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -100,6 +100,7 @@ public abstract class PlayerList {