Skip to content

Commit 8fa7462

Browse files
committed
Bla
1 parent d1a899a commit 8fa7462

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/game/Entities/GameObject.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ bool GameObject::Create(uint32 dbGuid, uint32 guidlow, uint32 name_id, Map* map,
199199
return false;
200200
}
201201

202-
Object::_Create(dbGuid, guidlow, goinfo->id, HIGHGUID_GAMEOBJECT);
202+
Object::_Create(dbGuid, guidlow, goinfo->id, goinfo->type == GAMEOBJECT_TYPE_TRANSPORT ? HIGHGUID_TRANSPORT : HIGHGUID_GAMEOBJECT);
203203

204204
m_goInfo = goinfo;
205205

src/game/Entities/Object.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint8 updateFlags) const
352352
case TYPEID_GAMEOBJECT:
353353
case TYPEID_DYNAMICOBJECT:
354354
case TYPEID_CORPSE:
355-
*data << uint32(GetGUIDLow()); // GetGUIDLow()
356-
break;
357-
case TYPEID_UNIT:
358-
*data << uint32(0x0000000B); // unk, can be 0xB or 0xC
355+
*data << uint32(GetObjectGuid().GetLower());
359356
break;
360357
case TYPEID_PLAYER:
361358
if (updateFlags & UPDATEFLAG_SELF)
@@ -380,10 +377,10 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint8 updateFlags) const
380377
case TYPEID_GAMEOBJECT:
381378
case TYPEID_DYNAMICOBJECT:
382379
case TYPEID_CORPSE:
383-
*data << uint32(GetObjectGuid().GetHigh()); // GetGUIDHigh()
380+
*data << uint32(GetObjectGuid().GetUpper());
384381
break;
385382
default:
386-
*data << uint32(0x00000000); // unk
383+
*data << uint32(0x0000000B); // unk
387384
break;
388385
}
389386
}

src/game/Entities/ObjectGuid.h

+3
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ class ObjectGuid
121121

122122
uint32 GetMaxCounter() const { return GetMaxCounter(GetHigh()); }
123123

124+
uint32 GetUpper() const { return m_guid >> 32; }
125+
uint32 GetLower() const { return m_guid; }
126+
124127
bool IsEmpty() const { return m_guid == 0; }
125128
bool IsCreature() const { return GetHigh() == HIGHGUID_UNIT; }
126129
bool IsPet() const { return GetHigh() == HIGHGUID_PET; }

src/game/Server/WorldSocket.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ std::deque<uint32> WorldSocket::GetIncOpcodeHistory()
9393
}
9494

9595
WorldSocket::WorldSocket(boost::asio::io_service& service) : AsyncSocket(service), m_lastPingTime(std::chrono::system_clock::time_point::min()), m_overSpeedPings(0),
96-
m_session(nullptr), m_seed(urand()), m_loggingPackets(false)
96+
m_session(nullptr), m_seed(urand()), m_loggingPackets(true)
9797
{
9898
}
9999

0 commit comments

Comments
 (0)