aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/MovementHandler.cpp4
-rw-r--r--src/game/Unit.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 3dcabf77dd2..9863d680117 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -197,12 +197,12 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
return;
// Handle possessed unit movement separately
- Unit* pos_unit = GetPlayer()->GetCharm();
+ /*Unit* pos_unit = GetPlayer()->GetCharm();
if (pos_unit && pos_unit->isPossessed()) // can be charmed but not possessed
{
HandlePossessedMovement(recv_data, movementInfo, movementInfo.flags);
return;
- }
+ }*/
if (GetPlayer()->GetDontMove())
return;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 1bba08fcad6..66aeafcf032 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7183,7 +7183,7 @@ Unit* Unit::GetCharm() const
sLog.outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid));
const_cast<Unit*>(this)->SetCharm(0);
- const_cast<Unit*>(this)->SetMover(0);
+ //const_cast<Unit*>(this)->SetMover(0);
}
return NULL;