From 48d796fa466ab1e57b269f2aea2fc821468d43b0 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Thu, 29 Oct 2020 13:00:52 -0400
Subject: [PATCH] Clean Up Code

---
 mods/src/extra.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mods/src/extra.c b/mods/src/extra.c
index d069ace..a7e6a30 100644
--- a/mods/src/extra.c
+++ b/mods/src/extra.c
@@ -179,6 +179,10 @@ __attribute__((constructor)) static void init() {
         patch((void *) 0x292fc, touch_gui_patch);
     }
 
+    // Dyanmic Game Mode Switching
+    set_is_survival(1);
+    Minecraft_setIsCreativeMode_original = overwrite((void *) Minecraft_setIsCreativeMode, Minecraft_setIsCreativeMode_injection);
+
     // Get Default Game Mode
     int default_game_mode;
     if (is_server) {
@@ -187,10 +191,6 @@ __attribute__((constructor)) static void init() {
         default_game_mode = !extra_has_feature("Survival Mode");
     }
 
-    // Dyanmic Game Mode Switching
-    set_is_survival(!default_game_mode);
-    Minecraft_setIsCreativeMode_original = overwrite((void *) Minecraft_setIsCreativeMode, Minecraft_setIsCreativeMode_injection);
-
     // Set Default Game Mode
     unsigned char default_game_mode_patch[4] = {default_game_mode ? 0x01 : 0x00, 0x30, 0xa0, 0xe3};
     patch((void *) 0x3d9b8, default_game_mode_patch);