Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27: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:
PaperMC/Paper@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0012-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9918cc39247037c0a8379071167c5560dce9bc8d..9ab314490b975417e28f129c72077a7198cf4cc7 100644
index f6360f2973c03e0105361f9e001360ec01488ce6..e40144aad9182ccb2ed871d74378cf0af783c9f1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2053,8 +2053,63 @@ public class ServerPlayer extends Player {
@@ -2051,8 +2051,63 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();
@@ -73,7 +73,7 @@ index 9918cc39247037c0a8379071167c5560dce9bc8d..9ab314490b975417e28f129c72077a71
return this.stats;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d89e7697f12f06f49d4063fa0b06c90a56c6967c..1c527309483db75d0bade9662280601078895306 100644
index d0a0c874984f628a9fe43696bbbe3ec6e981c2dd..a2a1e678d286d2d2b47b7df6318c4eef4bf64127 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -335,6 +335,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -97,7 +97,7 @@ index d89e7697f12f06f49d4063fa0b06c90a56c6967c..1c527309483db75d0bade96622806010
public CraftPlayer getCraftPlayer() {
return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
}
@@ -432,6 +446,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -428,6 +442,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) (this.server.getPlayerIdleTimeout() * 1000 * 60) && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits.
@@ -110,7 +110,7 @@ index d89e7697f12f06f49d4063fa0b06c90a56c6967c..1c527309483db75d0bade96622806010
this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
}
@@ -735,6 +755,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -731,6 +751,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -119,7 +119,7 @@ index d89e7697f12f06f49d4063fa0b06c90a56c6967c..1c527309483db75d0bade96622806010
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1539,7 +1561,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1535,7 +1557,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
flag2 = true; // Paper - diff on change, this should be moved wrongly
@@ -128,7 +128,7 @@ index d89e7697f12f06f49d4063fa0b06c90a56c6967c..1c527309483db75d0bade96622806010
}
this.player.absMoveTo(d0, d1, d2, f, f1);
@@ -1590,6 +1612,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1586,6 +1608,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();