Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Entities: Fix transport guid format to match client expectations

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e0a0dbe41c5ed0db078d0897d54f3cd8f75abc99)
This commit is contained in:
hondacrx
2019-09-08 12:48:39 -04:00
parent 5b67e2f539
commit 3a3ba9ac2a
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/ObjectGuid.cs
+24 -10
View File
@@ -64,21 +64,22 @@ namespace Game.Entities
} }
public static ObjectGuid Create(HighGuid type, uint mapId, uint entry, ulong counter) public static ObjectGuid Create(HighGuid type, uint mapId, uint entry, ulong counter)
{ {
if (type == HighGuid.Transport)
return ObjectGuid.Empty;
return MapSpecificCreate(type, 0, (ushort)mapId, 0, entry, counter); return MapSpecificCreate(type, 0, (ushort)mapId, 0, entry, counter);
} }
public static ObjectGuid Create(HighGuid type, SpellCastSource subType, uint mapId, uint entry, ulong counter)
public static ObjectGuid Create(HighGuid type, SpellCastSource subType, uint mapId, uint entry, ulong counter) { return MapSpecificCreate(type, (byte)subType, (ushort)mapId, 0, entry, counter); } {
return MapSpecificCreate(type, (byte)subType, (ushort)mapId, 0, entry, counter);
}
static ObjectGuid GlobalCreate(HighGuid type, ulong counter) static ObjectGuid GlobalCreate(HighGuid type, ulong counter)
{ {
return new ObjectGuid(((ulong)type << 58), counter); return new ObjectGuid((ulong)type << 58, counter);
} }
static ObjectGuid RealmSpecificCreate(HighGuid type, ulong counter) static ObjectGuid RealmSpecificCreate(HighGuid type, ulong counter)
{ {
return new ObjectGuid(((ulong)type << 58 | (ulong)Global.WorldMgr.GetRealm().Id.Realm << 42), counter); if (type == HighGuid.Transport)
return new ObjectGuid((ulong)type << 58 | (counter << 38), 0);
else
return new ObjectGuid((ulong)type << 58 | (ulong)Global.WorldMgr.GetRealm().Id.Realm << 42, counter);
} }
static ObjectGuid MapSpecificCreate(HighGuid type, byte subType, ushort mapId, uint serverId, uint entry, ulong counter) static ObjectGuid MapSpecificCreate(HighGuid type, byte subType, ushort mapId, uint serverId, uint entry, ulong counter)
{ {
@@ -122,7 +123,20 @@ namespace Game.Entities
uint GetServerId() { return (uint)((_low >> 40) & 0x1FFF); } uint GetServerId() { return (uint)((_low >> 40) & 0x1FFF); }
uint GetMapId() { return (uint)((_high >> 29) & 0x1FFF); } uint GetMapId() { return (uint)((_high >> 29) & 0x1FFF); }
public uint GetEntry() { return (uint)((_high >> 6) & 0x7FFFFF); } public uint GetEntry() { return (uint)((_high >> 6) & 0x7FFFFF); }
public ulong GetCounter() { return _low & 0xFFFFFFFFFF; } public ulong GetCounter()
{
if (GetHigh() == HighGuid.Transport)
return (_high >> 38) & 0xFFFFF;
else
return _low & 0xFFFFFFFFFF;
}
public static ulong GetMaxCounter(HighGuid highGuid)
{
if (highGuid == HighGuid.Transport)
return 0xFFFFF;
else
return 0xFFFFFFFFFF;
}
public bool IsEmpty() { return _low == 0 && _high == 0; } public bool IsEmpty() { return _low == 0 && _high == 0; }
public bool IsCreature() { return GetHigh() == HighGuid.Creature; } public bool IsCreature() { return GetHigh() == HighGuid.Creature; }
@@ -324,7 +338,7 @@ namespace Game.Entities
public ulong Generate() public ulong Generate()
{ {
if (_nextGuid >= ulong.MaxValue - 1) if (_nextGuid >= ObjectGuid.GetMaxCounter(_highGuid) - 1)
HandleCounterOverflow(); HandleCounterOverflow();
return _nextGuid++; return _nextGuid++;
} }