diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
index d44252233..7a5c47444 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
@@ -43,14 +43,7 @@ public class JavaJoinGameTranslator extends PacketTranslator<ServerJoinGamePacke
         bedrockPacket.setUniqueEntityId(packet.getEntityId());
         session.getUpstream().sendPacketImmediately(bedrockPacket);
 
-        int gamemode = 0;
-        if (packet.getGameMode().equals(GameMode.CREATIVE)) {
-            gamemode = 1;
-        } else if (packet.getGameMode().equals(GameMode.ADVENTURE)) {
-            gamemode = 2;
-        } else if (packet.getGameMode().equals(GameMode.SPECTATOR)) {
-            gamemode = 3;
-        }
+        int gamemode = packet.getGameMode().ordinal();
         SetPlayerGameTypePacket playerGameTypePacket = new SetPlayerGameTypePacket();
         playerGameTypePacket.setGamemode(gamemode);
 
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaNotifyClientTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaNotifyClientTranslator.java
index 8ef64503f..f94d726d5 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaNotifyClientTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaNotifyClientTranslator.java
@@ -57,14 +57,7 @@ public class JavaNotifyClientTranslator extends PacketTranslator<ServerNotifyCli
                 session.getUpstream().sendPacket(stopRainPacket);
                 break;
             case CHANGE_GAMEMODE:
-                int gamemode = 0;
-                if (packet.getValue().equals(GameMode.CREATIVE)) {
-                    gamemode = 1;
-                } else if (packet.getValue().equals(GameMode.ADVENTURE)) {
-                    gamemode = 2;
-                } else if (packet.getValue().equals(GameMode.SPECTATOR)) {
-                    gamemode = 3;
-                }
+                int gamemode = ((GameMode) packet.getValue()).ordinal();
                 SetPlayerGameTypePacket playerGameTypePacket = new SetPlayerGameTypePacket();
                 playerGameTypePacket.setGamemode(gamemode);
                 break;