diff --git a/patches/server/0039-Implement-AFK-API.patch b/patches/server/0039-Implement-AFK-API.patch index 7ffc86d05..3381a23fa 100644 --- a/patches/server/0039-Implement-AFK-API.patch +++ b/patches/server/0039-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From c98618cb1f74db04eb19104e28223a0238d9b696 Mon Sep 17 00:00:00 2001 +From 85245049408f5357a575ddb8baeaef8d51bd475b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] Implement AFK API @@ -9,13 +9,13 @@ Subject: [PATCH] Implement AFK API .../net/minecraft/server/EntityPlayer.java | 43 +++++++++++++++++++ .../net/minecraft/server/IEntityAccess.java | 34 ++++++--------- .../net/minecraft/server/IEntitySelector.java | 2 + - .../minecraft/server/PlayerConnection.java | 10 +++++ + .../minecraft/server/PlayerConnection.java | 12 +++++- .../net/minecraft/server/WorldServer.java | 4 +- .../net/pl3x/purpur/PurpurWorldConfig.java | 11 +++++ .../craftbukkit/entity/CraftPlayer.java | 17 ++++++++ .../java/org/spigotmc/ActivationRange.java | 1 + src/main/resources/purpur.lang | 4 +- - 11 files changed, 111 insertions(+), 25 deletions(-) + 11 files changed, 112 insertions(+), 26 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 08645bd03..580843686 100644 @@ -171,7 +171,7 @@ index 1398c47a2..0bf1a14b7 100644 public static Predicate a(double d0, double d1, double d2, double d3) { double d4 = d3 * d3; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 944610737..09cab5a99 100644 +index 944610737..26268a160 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -196,11 +196,20 @@ index 944610737..09cab5a99 100644 // Skip the first time we do this if (true) { // Spigot - don't skip any move events Location oldTo = to.clone(); +@@ -1112,7 +1120,7 @@ public class PlayerConnection implements PacketListenerPlayIn { + + if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot + flag1 = true; +- PlayerConnection.LOGGER.warn("{} moved wrongly!", this.player.getDisplayName().getString()); ++ PlayerConnection.LOGGER.warn("{} moved wrongly! ({})", this.player.getDisplayName().getString(), d11); // Purpur + } + + this.player.setLocation(d4, d5, d6, f, f1); @@ -1158,6 +1166,8 @@ public class PlayerConnection implements PacketListenerPlayIn { this.lastYaw = to.getYaw(); this.lastPitch = to.getPitch(); -+ if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ()) this.player.resetIdleTimer(); // Purpur ++ if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetIdleTimer(); // Purpur + // Skip the first time we do this if (from.getX() != Double.MAX_VALUE) {