mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Merge commit 'origin/master' into 320
This commit is contained in:
commit
373a837aa5
17 changed files with 156 additions and 123 deletions
|
|
@ -152,6 +152,7 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
|
|||
{
|
||||
uint32 entry;
|
||||
recv_data >> entry;
|
||||
recv_data.read_skip<uint64>(); // guid
|
||||
|
||||
CreatureInfo const *ci = objmgr.GetCreatureTemplate(entry);
|
||||
if (ci)
|
||||
|
|
@ -219,6 +220,7 @@ void WorldSession::HandleGameObjectQueryOpcode( WorldPacket & recv_data )
|
|||
{
|
||||
uint32 entryID;
|
||||
recv_data >> entryID;
|
||||
recv_data.read_skip<uint64>(); // guid
|
||||
|
||||
const GameObjectInfo *info = objmgr.GetGameObjectInfo(entryID);
|
||||
if(info)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue