1 files changed, 4 insertions, 15 deletions
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index c47b3e2c7..a40bcd1aa 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -64,25 +64,14 @@ namespace TmwAthena
 static void setGm(Being *const dstBeing,
                   const uint16_t gmstatus)
 {
-    if (dstBeing != localPlayer)
+    if (dstBeing != localPlayer &&
+        gmstatus == 0x80)
     {
-        if (gmstatus == 0x80)
-        {
-            dstBeing->setGroupId(paths.getIntValue("gmDefaultLevel"));
-            dstBeing->setGM(true);
-        }
-        else
-        {
-            dstBeing->setGroupId(gmstatus);
-            dstBeing->setGM(gmstatus != 0);
-        }
+        dstBeing->setGroupId(paths.getIntValue("gmDefaultLevel"));
     }
     else
     {
-        if (gmstatus != 0)
-            dstBeing->setGM(true);
-        else
-            dstBeing->setGM(false);
+        dstBeing->setGroupId(gmstatus);
     }
 }