server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66 from H0zen/develop21

Browse Source 
Fix Unit::SetConfused to work on players.
This commit is contained in:
MadMax 2016-01-22 15:05:47 +00:00
commit 7b3e65f5c6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/Object/Unit.cpp
View File

@ -8553,7 +8553,7 @@ void Unit::SetFeared(bool apply, ObjectGuid casterGuid, uint32 spellID, uint32 t
} }
if (GetTypeId() == TYPEID_PLAYER) if (GetTypeId() == TYPEID_PLAYER)
{ ((Player*)this)->SetClientControl(this, apply ? 0 : 1); } { ((Player*)this)->SetClientControl(this, !apply); }
} }
void Unit::SetConfused(bool apply, ObjectGuid casterGuid, uint32 spellID) void Unit::SetConfused(bool apply, ObjectGuid casterGuid, uint32 spellID)
@ -8566,10 +8566,9 @@ void Unit::SetConfused(bool apply, ObjectGuid casterGuid, uint32 spellID)
CastStop(GetObjectGuid() == casterGuid ? spellID : 0); CastStop(GetObjectGuid() == casterGuid ? spellID : 0);
if (GetTypeId() == TYPEID_UNIT) if (GetTypeId() == TYPEID_UNIT)
{ SetTargetGuid(ObjectGuid());
SetTargetGuid(ObjectGuid());
GetMotionMaster()->MoveConfused(); GetMotionMaster()->MoveConfused();
}
} }
else else
{ {
@ -8593,7 +8592,7 @@ void Unit::SetConfused(bool apply, ObjectGuid casterGuid, uint32 spellID)
} }
if (GetTypeId() == TYPEID_PLAYER) if (GetTypeId() == TYPEID_PLAYER)
{ ((Player*)this)->SetClientControl(this, apply ? 0 : 1); } { ((Player*)this)->SetClientControl(this, !apply); }
} }
void Unit::SetFeignDeath(bool apply, ObjectGuid casterGuid /*= ObjectGuid()*/) void Unit::SetFeignDeath(bool apply, ObjectGuid casterGuid /*= ObjectGuid()*/)

9
src/game/WorldHandlers/MovementHandler.cpp
View File

@ -385,10 +385,11 @@ void WorldSession::HandleMoveNotActiveMoverOpcode(WorldPacket& recv_data)
if (_player->GetMover()->GetObjectGuid() == old_mover_guid) if (_player->GetMover()->GetObjectGuid() == old_mover_guid)
{ {
sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is %s and should be %s instead of %s", if (_player->GetObjectGuid() != old_mover_guid )
_player->GetMover()->GetGuidStr().c_str(), sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is %s and should be %s instead of %s",
_player->GetGuidStr().c_str(), _player->GetMover()->GetGuidStr().c_str(),
old_mover_guid.GetString().c_str()); _player->GetGuidStr().c_str(),
old_mover_guid.GetString().c_str());
recv_data.rpos(recv_data.wpos()); // prevent warnings spam recv_data.rpos(recv_data.wpos()); // prevent warnings spam
return; return;
} }