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@e5bbb56 Added 1.19 kick event causes (#8204)
This commit is contained in:
BillyGalbreath
2022-07-29 12:59:04 -05:00
parent 13320470dc
commit 723e3703b2
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0013-AFK-API.patch
View File

@@ -68,7 +68,7 @@ index 8c18c203854628c0dd8d660b197127b019fec971..f2e84f02ee8c9c4e4cb2fa5ca27c2df5
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 b273c189f699467be57a908d1c46f1b0a80d3d6b..85d18e94ee93f1348871eca697c723eb5482db6b 100644
index 46e847ac7f0652dceda9beb0c3fe69b7847897d1..eed7394c5736df4a966343cd8c1482dc0dfd0164 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
@@ -105,7 +105,7 @@ index b273c189f699467be57a908d1c46f1b0a80d3d6b..85d18e94ee93f1348871eca697c723eb
this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
}
@@ -745,6 +765,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -747,6 +767,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -114,7 +114,7 @@ index b273c189f699467be57a908d1c46f1b0a80d3d6b..85d18e94ee93f1348871eca697c723eb
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1545,7 +1567,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1547,7 +1569,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 b273c189f699467be57a908d1c46f1b0a80d3d6b..85d18e94ee93f1348871eca697c723eb
}
this.player.absMoveTo(d0, d1, d2, f, f1);
@@ -1595,6 +1617,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1597,6 +1619,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 a3522f87a1f3c1efef6f65d2ba37ba0eccbc5fce..69084657049dccad5ba26d22668e8930ff086be8 100644
index f5e2a82f279e8c91b736410147d5e8476f3da128..1a4da06d45c88219ec0149f94876931f6c699dc9 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 {