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

Core/Items: Implement azerite empowered items

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d934824421c83598853487c5cc9e4cbb3c5d0006)
This commit is contained in:
hondacrx
2019-12-05 22:55:44 -05:00
parent 86e1065da0
commit 5b9ad41953
47 changed files with 1050 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Collision/Maps/MapTree.cs
+5 -5
View File
@@ -142,9 +142,9 @@ namespace Game.Collision
Log.outError(LogFilter.Server, "StaticMapTree.LoadMapTile() : could not acquire WorldModel [{0}, {1}]", tileX, tileY);
// update tree
if (iSpawnIndices.ContainsKey(spawn.ID))
if (iSpawnIndices.ContainsKey(spawn.Id))
{
uint referencedVal = iSpawnIndices[spawn.ID];
uint referencedVal = iSpawnIndices[spawn.Id];
if (!iLoadedSpawns.ContainsKey(referencedVal))
{
if (referencedVal >= iNTreeValues)
@@ -202,13 +202,13 @@ namespace Game.Collision
vm.ReleaseModelInstance(spawn.name);
// update tree
if (!iSpawnIndices.ContainsKey(spawn.ID))
if (!iSpawnIndices.ContainsKey(spawn.Id))
result = false;
else
{
uint referencedNode = iSpawnIndices[spawn.ID];
uint referencedNode = iSpawnIndices[spawn.Id];
if (!iLoadedSpawns.ContainsKey(referencedNode))
Log.outError(LogFilter.Server, "StaticMapTree.UnloadMapTile() : trying to unload non-referenced model '{0}' (ID:{1})", spawn.name, spawn.ID);
Log.outError(LogFilter.Server, "StaticMapTree.UnloadMapTile() : trying to unload non-referenced model '{0}' (ID:{1})", spawn.name, spawn.Id);
else if (--iLoadedSpawns[referencedNode] == 0)
{
iTreeValues[referencedNode].SetUnloaded();
Source/Game/Collision/Models/ModelInstance.cs
+3 -3
View File
@@ -36,7 +36,7 @@ namespace Game.Collision
{
flags = spawn.flags;
adtId = spawn.adtId;
ID = spawn.ID;
Id = spawn.Id;
iPos = spawn.iPos;
iRot = spawn.iRot;
iScale = spawn.iScale;
@@ -50,7 +50,7 @@ namespace Game.Collision
spawn.flags = reader.ReadUInt32();
spawn.adtId = reader.ReadUInt16();
spawn.ID = reader.ReadUInt32();
spawn.Id = reader.ReadUInt32();
spawn.iPos = reader.Read<Vector3>();
spawn.iRot = reader.Read<Vector3>();
spawn.iScale = reader.ReadSingle();
@@ -70,7 +70,7 @@ namespace Game.Collision
public uint flags;
public ushort adtId;
public uint ID;
public uint Id;
public Vector3 iPos;
public Vector3 iRot;
public float iScale;