From 3310ee0fe6e229d55b070d0112b31fe54f1cc5cc Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Thu, 19 Apr 2018 22:47:03 +1000
Subject: [PATCH] Gm invis is less of a hack

---
 .../Network/Handlers/GMCommandHandlers.cpp    | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 8c170ccc..7f1d99d0 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -226,29 +226,16 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Invis:
    {
-      if( targetPlayer->getGmInvis() == false ) {
-         targetPlayer->setGmInvis( true );
-         auto inRange = targetPlayer->getInRangeActors();
-         for( auto actor : inRange )
-         {
-            targetPlayer->despawn( actor->getAsPlayer() );
-            targetPlayer->spawn( actor->getAsPlayer() );
-         }
-         player.sendNotice( "Invisibility flag for " + targetPlayer->getName() + " was toggled to on" );
-         break;
-      }
-      else
+      player.setGmInvis( !player.getGmInvis() );
+      player.sendNotice( "Invisibility flag for " + player.getName() +
+         " was toggled to " + std::to_string( !player.getGmInvis() ) );
+
+      for( auto actor : player.getInRangeActors() )
       {
-         targetPlayer->setGmInvis( false );
-         auto inRange = targetPlayer->getInRangeActors();
-         for( auto actor : inRange )
-         {
-            targetPlayer->despawn( actor->getAsPlayer() );
-            targetPlayer->spawn( actor->getAsPlayer() );
-         }
-         player.sendNotice( "Invisibility flag for " + targetPlayer->getName() + " was toggled to off" );
-         break;
+         player.despawn( actor->getAsPlayer() );
+         player.spawn( actor->getAsPlayer() );
       }
+      break;
    }
    case GmCommand::Kill:
    {