Core/Unit: Random code style/naming adjustments
Port From (https://github.com/TrinityCore/TrinityCore/commit/05119fd90949340cad4a700d12069154a2faf5f6)
This commit is contained in:
@@ -125,7 +125,7 @@ namespace Game.Entities
|
||||
public Vehicle VehicleKit { get; set; }
|
||||
bool canModifyStats;
|
||||
public uint LastSanctuaryTime { get; set; }
|
||||
uint m_transform;
|
||||
uint m_transformSpell;
|
||||
bool m_cleanupDone; // lock made to not add stuff after cleanup before delete
|
||||
bool m_duringRemoveFromWorld; // lock made to not add stuff after begining removing from world
|
||||
bool _instantCast;
|
||||
|
||||
@@ -1782,9 +1782,10 @@ namespace Game.Entities
|
||||
public bool HasInvisibilityAura() { return HasAuraType(AuraType.ModInvisibility); }
|
||||
public bool IsFeared() { return HasAuraType(AuraType.ModFear); }
|
||||
public bool IsFrozen() { return HasAuraState(AuraStateType.Frozen); }
|
||||
public bool HasRootAura() { return HasAuraType(AuraType.ModRoot) || HasAuraType(AuraType.ModRoot2); }
|
||||
public bool IsPolymorphed()
|
||||
{
|
||||
uint transformId = GetTransForm();
|
||||
uint transformId = GetTransformSpell();
|
||||
if (transformId == 0)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@ namespace Game.Entities
|
||||
|
||||
public bool IsInDisallowedMountForm()
|
||||
{
|
||||
return IsDisallowedMountForm(GetTransForm(), GetShapeshiftForm(), GetDisplayId());
|
||||
return IsDisallowedMountForm(GetTransformSpell(), GetShapeshiftForm(), GetDisplayId());
|
||||
}
|
||||
|
||||
public bool IsDisallowedMountForm(uint spellId, ShapeShiftForm form, uint displayId)
|
||||
@@ -510,8 +510,8 @@ namespace Game.Entities
|
||||
base.CleanupsBeforeDelete(finalCleanup);
|
||||
}
|
||||
|
||||
public void SetTransForm(uint spellid) { m_transform = spellid; }
|
||||
public uint GetTransForm() { return m_transform; }
|
||||
public void SetTransformSpell(uint spellid) { m_transformSpell = spellid; }
|
||||
public uint GetTransformSpell() { return m_transformSpell; }
|
||||
|
||||
public Vehicle GetVehicleKit() { return VehicleKit; }
|
||||
public Vehicle GetVehicle() { return m_vehicle; }
|
||||
|
||||
Reference in New Issue
Block a user