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 appear to apply and compile correctly

Paper Changes:
81a537c1f Add PlayerKickEvent causes (#5648)
b7976b956 Add More Lidded Block API (#5707)
This commit is contained in:
BillyGalbreath
2021-05-26 07:04:11 -05:00
parent 2aacc76669
commit 9fec1bae8c
26 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10935,7 +10935,7 @@ index 1d72af9cace7aa8f1d20c7c1c5be621f533e2dad..b7399d17dd64ca8b1f1fab405cb0ac91
worldData.addProperty("keep-spawn-loaded-range", world.paperConfig.keepLoadedRange);
worldData.addProperty("visible-chunk-count", visibleChunks.size());
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 848219f43b2bcb2d79147107c68df52efd46d461..72d1c1202581abc284848000663ada5514cfcb15 100644
index d88ba18014087a5f945c1ea616b83a7df133e25c..1de40d14b90b0bc4a75c4dd4052b4600101c04a5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -268,6 +268,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -15021,10 +15021,10 @@ index 5b69126142140c7fc96435a4d246752581f47c33..25437a993c02379fa43e5d46159cd9ba
throw new IllegalStateException("Protocol error", cryptographyexception);
}
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2b830155e 100644
index 4001078e2a408dfd5a93c21f55a58c1fde32abbb..8513795943497ca80232e7d47066a6944c2f45ec 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -542,6 +542,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -550,6 +550,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
double currDeltaZ = toZ - fromZ;
double d10 = Math.max(d6 * d6 + d7 * d7 + d8 * d8, (currDeltaX * currDeltaX + currDeltaY * currDeltaY + currDeltaZ * currDeltaZ) - 1);
// Paper end - fix large move vectors killing the server
@@ -15037,7 +15037,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
// CraftBukkit start - handle custom speeds and skipped ticks
@@ -570,7 +576,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -578,7 +584,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
@@ -15048,7 +15048,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -583,12 +591,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -591,12 +599,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
return;
}
@@ -15067,7 +15067,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
double d11 = d7;
d6 = d3 - entity.locX();
@@ -602,16 +612,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -610,16 +620,25 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean flag1 = false;
if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
@@ -15097,7 +15097,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
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));
@@ -697,7 +716,32 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -705,7 +724,32 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
private boolean a(Entity entity) {
@@ -15131,7 +15131,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
}
@Override
@@ -1224,7 +1268,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1232,7 +1276,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -15140,7 +15140,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1262,6 +1306,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1270,6 +1314,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
double currDeltaZ = toZ - prevZ;
double d11 = Math.max(d7 * d7 + d8 * d8 + d9 * d9, (currDeltaX * currDeltaX + currDeltaY * currDeltaY + currDeltaZ * currDeltaZ) - 1);
// Paper end - fix large move vectors killing the server
@@ -15153,7 +15153,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
if (this.player.isSleeping()) {
if (d11 > 1.0D) {
@@ -1294,7 +1344,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1302,7 +1352,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -15162,7 +15162,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1311,11 +1361,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1319,11 +1369,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
@@ -15178,7 +15178,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
boolean flag = d8 > 0.0D;
if (this.player.isOnGround() && !packetplayinflying.b() && flag) {
@@ -1350,6 +1400,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1358,6 +1408,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -15186,7 +15186,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1369,12 +1420,23 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1377,12 +1428,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
@@ -15212,7 +15212,7 @@ index 304310cad03bce78a25ab0fb3e5e5f62ebd5558b..64fe0acfccd50465c5fe8c49346a6db2
this.a(d0, d1, d2, f, f1);
} else {
// CraftBukkit start - fire PlayerMoveEvent
@@ -1461,6 +1523,26 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1469,6 +1531,26 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
@@ -15256,7 +15256,7 @@ index 06b0ed65905b9829564dfddd29012218af0f403d..69a982832489fc78fd46418341bdcba1
protected void initChannel(Channel channel) throws Exception {
try {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 2a76c3624c64e93509a96579f48c507e29901625..ab113991486c913e0a05df1029571d3e920af9c7 100644
index 90776231b1faffb11e4394f555f336ca248e3004..5936075251ef3d6dda3e93866009d0e996598698 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -179,6 +179,7 @@ public abstract class PlayerList {
@@ -20939,10 +20939,10 @@ index 295ffab08672d77d88aca368cb5b56f80bc4f1b5..dee4d12a49468d38f077784b219199f0
@Override
public boolean teleport(Location location) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 34395248e3daea47178cb40aad53680fbce73600..f82fb89e30e30681b2052d1c6a2f24428d6fbfc7 100644
index cfe6898dc373fe55a08acf5c90e200061aa7d0fc..ed1bb89ae7b85bf4017315d6189d6cbf595aefe5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2260,15 +2260,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2265,15 +2265,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}