diff --git a/modules/shazam.py b/modules/shazam.py
index 72562e5..b5b52e7 100644
--- a/modules/shazam.py
+++ b/modules/shazam.py
@@ -15,16 +15,20 @@ def malasaurSetGamemode(gamemode: str):
     malasaurGamemode = gamemode.lower()
 
 
-@libsignal.onMessage(RetardsServer)
-def shazam(usr: str, msg: str):
-    if usr == "Malasaur" and "shazam" in msg.lower():
+@libminecraft.onConsoleOutput(r"\[.*\] \[Server thread\/INFO\]: <Malasaur> (.*)")
+def shazam(msg: str):
+    global malasaurGamemode
+
+    if "shazam" in msg.lower():
         if malasaurGamemode == "survival":
             libminecraft.sendCommand("gamemode creative Malasaur")
             libminecraft.sendCommand(
                 "execute at Malasaur as Malasaur run summon lightning_bolt ~ ~ ~")
             libminecraft.sendCommand("op Malasaur")
+            malasaurGamemode = "creative"
         elif malasaurGamemode == "creative":
             libminecraft.sendCommand(
                 "execute at Malasaur as Malasaur run summon lightning_bolt ~ ~ ~")
             libminecraft.sendCommand("gamemode survival Malasaur")
             libminecraft.sendCommand("deop Malasaur")
+            malasaurGamemode = "survival"