Core/Misc: Reduce differences between branches

2 files changed, 5 insertions, 3 deletions

diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp
index a112169d903..af782b2d509 100644
--- a/src/server/scripts/Commands/cs_cheat.cpp
+++ b/src/server/scripts/Commands/cs_cheat.cpp
@@ -165,13 +165,13 @@ public:
         if (enable)
         {
             handler->GetSession()->GetPlayer()->SetCommandStatusOn(CHEAT_WATERWALK);
-            handler->GetSession()->GetPlayer()->SetWaterWalking(true);      // ON
+            handler->GetSession()->GetPlayer()->SetWaterWalking(true);                      // ON
             handler->SendSysMessage("Waterwalking is ON. You can walk on water.");
         }
         else
         {
             handler->GetSession()->GetPlayer()->SetCommandStatusOff(CHEAT_WATERWALK);
-            handler->GetSession()->GetPlayer()->SetWaterWalking(false);     // OFF
+            handler->GetSession()->GetPlayer()->SetWaterWalking(false);                     // OFF
             handler->SendSysMessage("Waterwalking is OFF. You can't walk on water.");
         }
 
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 7c8bc42f663..cdd03bea274 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1328,7 +1328,9 @@ public:
                 target->SetExtraUnitMovementFlags(*moveFlagsExtra);
             }
 
-            if (moveFlagsExtra || unhandledFlag)
+            if (target->GetTypeId() != TYPEID_PLAYER)
+                target->DestroyForNearbyPlayers();  // Force new SMSG_UPDATE_OBJECT:CreateObject
+            else
                 target->SendMovementFlagUpdate();
 
             handler->PSendSysMessage(LANG_MOVEFLAGS_SET, target->GetUnitMovementFlags(), target->GetExtraUnitMovementFlags());