From 15391ed3746a911707abd869287fc90707cf6340 Mon Sep 17 00:00:00 2001
From: Brite <48929405+BriteBytes@users.noreply.github.com>
Date: Mon, 23 Mar 2026 10:21:43 +0000
Subject: [PATCH] Only store originalGameMode if NULL

---
 .../com/sk89q/worldguard/session/handler/GameModeFlag.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java
index 4dbf0ab44..b773f9148 100644
--- a/worldguard-core/src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java
+++ b/worldguard-core/src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java
@@ -59,7 +59,9 @@ public GameMode getSetGameMode() {
     private void updateGameMode(LocalPlayer player, @Nullable GameMode newValue, World world) {
         if (!getSession().getManager().hasBypass(player, world) && newValue != null) {
             if (player.getGameMode() != newValue) {
-                originalGameMode = player.getGameMode();
+                if (originalGameMode == null) {
+                    originalGameMode = player.getGameMode();
+                }
                 player.setGameMode(newValue);
             } else if (originalGameMode == null) {
                 originalGameMode = WorldGuard.getInstance().getPlatform().getDefaultGameMode();