From 8e4da810220f2fc875962e0cb83c9125e15fe9ad Mon Sep 17 00:00:00 2001
From: EnZaXD <florian.michael07@gmail.com>
Date: Wed, 6 Nov 2024 15:46:11 +0100
Subject: [PATCH] Move config option check for placement fix into packet
 handlers (#4248)

Fixes the config option breaking when using the reload command, also changes the message when using the /reload sub command.
---
 .../commands/defaultsubs/ReloadSubCmd.java        |  2 +-
 .../rewriter/EntityPacketRewriter1_21.java        | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ReloadSubCmd.java b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ReloadSubCmd.java
index 2c0817a66..5c850bc65 100644
--- a/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ReloadSubCmd.java
+++ b/common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/ReloadSubCmd.java
@@ -35,7 +35,7 @@ public class ReloadSubCmd implements ViaSubCommand {
     @Override
     public boolean execute(ViaCommandSender sender, String[] args) {
         Via.getManager().getConfigurationProvider().reloadConfigs();
-        sendMessage(sender, "&6Configuration successfully reloaded! Some features may need a restart.");
+        sendMessage(sender, "&6Configuration successfully reloaded! Some config options may require a restart to take effect.");
         return true;
     }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/EntityPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/EntityPacketRewriter1_21.java
index cf33e9857..26df9035d 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/EntityPacketRewriter1_21.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/EntityPacketRewriter1_21.java
@@ -125,10 +125,10 @@ public final class EntityPacketRewriter1_21 extends EntityRewriter<ClientboundPa
         });
 
         // Tracks on ground state for block interactions
-        if (!Via.getConfig().fix1_21PlacementRotation()) {
-            return;
-        }
         protocol.registerServerbound(ServerboundPackets1_20_5.MOVE_PLAYER_POS, wrapper -> {
+            if (!Via.getConfig().fix1_21PlacementRotation()) {
+                return;
+            }
             wrapper.passthrough(Types.DOUBLE); // X
             wrapper.passthrough(Types.DOUBLE); // Y
             wrapper.passthrough(Types.DOUBLE); // Z
@@ -136,12 +136,18 @@ public final class EntityPacketRewriter1_21 extends EntityRewriter<ClientboundPa
             wrapper.user().get(OnGroundTracker.class).setOnGround(wrapper.passthrough(Types.BOOLEAN));
         });
         protocol.registerServerbound(ServerboundPackets1_20_5.MOVE_PLAYER_ROT, wrapper -> {
+            if (!Via.getConfig().fix1_21PlacementRotation()) {
+                return;
+            }
             wrapper.passthrough(Types.FLOAT); // Yaw
             wrapper.passthrough(Types.FLOAT); // Pitch
 
             wrapper.user().get(OnGroundTracker.class).setOnGround(wrapper.passthrough(Types.BOOLEAN));
         });
         protocol.registerServerbound(ServerboundPackets1_20_5.MOVE_PLAYER_POS_ROT, wrapper -> {
+            if (!Via.getConfig().fix1_21PlacementRotation()) {
+                return;
+            }
             wrapper.passthrough(Types.DOUBLE); // X
             wrapper.passthrough(Types.DOUBLE); // Y
             wrapper.passthrough(Types.DOUBLE); // Z
@@ -151,6 +157,9 @@ public final class EntityPacketRewriter1_21 extends EntityRewriter<ClientboundPa
             wrapper.user().get(OnGroundTracker.class).setOnGround(wrapper.passthrough(Types.BOOLEAN));
         });
         protocol.registerServerbound(ServerboundPackets1_20_5.MOVE_PLAYER_STATUS_ONLY, wrapper -> {
+            if (!Via.getConfig().fix1_21PlacementRotation()) {
+                return;
+            }
             wrapper.user().get(OnGroundTracker.class).setOnGround(wrapper.passthrough(Types.BOOLEAN));
         });
     }