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:
PaperMC/Paper@0ddd20c Updated Upstream (CraftBukkit/Spigot)
PaperMC/Paper@9592da1 Add method to get highest anger level of warden
This commit is contained in:
BillyGalbreath
2022-08-14 04:43:41 -05:00
parent 0fd6a5698f
commit ac5c303a0d
23 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ 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 1628989f81e76fc61b2a894f7037f5630a1491bc..c72b20e3e7eda999c6da07e7e6fb46826c4369a9 100644
index 8e3e3dbbea328f76a790477545b46d2d3013546b..905aa1311791564720e541fc4fbe1e4f8d38a0e7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2001,8 +2001,58 @@ public class ServerPlayer extends Player {
@@ -68,10 +68,10 @@ index 1628989f81e76fc61b2a894f7037f5630a1491bc..c72b20e3e7eda999c6da07e7e6fb4682
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 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a17988474344d244 100644
index f11f917130298aeca48fa51c1d9ea8150df60d8b..b10a5f39145cf62b981fad6595e42ac09602d510 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -340,6 +340,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -343,6 +343,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private boolean justTeleported = false;
private boolean hasMoved; // Spigot
@@ -92,7 +92,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
public CraftPlayer getCraftPlayer() {
return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
}
@@ -442,6 +456,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -445,6 +459,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.
@@ -105,7 +105,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
}
@@ -747,6 +767,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -750,6 +770,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -114,7 +114,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1551,7 +1573,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1554,7 +1576,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
@@ -123,7 +123,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
}
this.player.absMoveTo(d0, d1, d2, f, f1);
@@ -1601,6 +1623,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1604,6 +1626,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a20e1a533e9f764fbf00e768fd8286c8f7868a78..fd5906dd18a4ff377c6e2dd180008124faa9600d 100644
index 6260f4246b24f5037e3cf718a50be3a70680132e..c57264e4f4284550d674a9c4083cc9cfbeb355bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {