Corrections to previous merged in PR

src/server/game/Entities/GameObject/GameObject.cpp

@@ -1930,7 +1930,7 @@ void GameObject::SetLootState(LootState state, Unit* unit)
         // Use the current go state
         if ((GetGoState() != GO_STATE_READY && (state == GO_ACTIVATED || state == GO_JUST_DEACTIVATED)) || state == GO_READY)
             collision = !collision;
-        
+
         EnableCollision(collision);
     }
 }
@@ -1947,7 +1947,7 @@ void GameObject::SetGoState(GOState state)
         // startOpen determines whether we are going to add or remove the LoS on activation
         bool collision = false;
         if (state == GO_STATE_READY)
-            collision = !collision; 
+            collision = !collision;
 
         EnableCollision(collision);
     }

src/server/game/Entities/Player/Player.cpp

@@ -863,6 +863,8 @@ Player::Player(WorldSession* session): Unit(true), m_achievementMgr(this), m_rep
     SetPendingBind(0, 0);
 
     _activeCheats = CHEAT_NONE;
+
+    _isWalkingBeforeCharm = false;
 }
 
 Player::~Player()

src/server/game/Entities/Unit/Unit.cpp

@@ -10016,7 +10016,7 @@ void Unit::SetCharm(Unit* charm, bool apply)
             charm->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
             charm->SetByteValue(UNIT_FIELD_BYTES_2, 1, 0);
         }
-        
+
         if (charm->IsWalking() != _isWalkingBeforeCharm)
         {
             charm->SetWalk(_isWalkingBeforeCharm);

src/server/game/Entities/Unit/Unit.h

@@ -2356,7 +2356,7 @@ class Unit : public WorldObject
 
         Spell const* _focusSpell;
         bool _targetLocked; // locks the target during spell cast for proper facing
-        bool _isWalkingBeforeCharm; // Are we walking before we were charmed? 
+        bool _isWalkingBeforeCharm; // Are we walking before we were charmed?
 };
 
 namespace Trinity