mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
Merge commit 'origin/master' into 310
Conflicts: src/game/AchievementMgr.cpp src/game/BattleGroundHandler.cpp src/game/CreatureEventAIMgr.cpp src/game/DBCStructure.h src/game/Player.cpp src/game/Spell.cpp src/shared/revision_nr.h
This commit is contained in:
commit
a9e148edac
45 changed files with 1119 additions and 298 deletions
|
|
@ -68,7 +68,7 @@ void WorldSession::HandleTalentWipeOpcode( WorldPacket & recv_data )
|
|||
uint64 guid;
|
||||
recv_data >> guid;
|
||||
|
||||
Creature *unit = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_TRAINER);
|
||||
Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_TRAINER);
|
||||
if (!unit)
|
||||
{
|
||||
sLog.outDebug( "WORLD: HandleTalentWipeOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue