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

Core/Skinning: Update correct skinning skill according to creature expansion

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/229a7ac79d38b9db76387f92e846c04c151ad3aa)
This commit is contained in:
hondacrx
2023-04-05 08:22:24 -04:00
parent 6361e60c8b
commit d3297b96a2
4 changed files with 45 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.cs
+12 -10
View File
@@ -563,7 +563,7 @@ namespace Game.Entities
vehicleRoot = vehicleRoot.GetVehicleBase();
}
}
public Creature GetVehicleCreatureBase()
{
Unit veh = GetVehicleBase();
@@ -891,7 +891,7 @@ namespace Game.Entities
return str;
}
public Guardian GetGuardianPet()
{
ObjectGuid pet_guid = GetPetGUID();
@@ -1315,12 +1315,12 @@ namespace Game.Entities
else
return true;
}
public bool IsPossessedByPlayer()
{
return HasUnitState(UnitState.Possessed) && GetCharmerGUID().IsPlayer();
}
public bool IsPossessing()
{
Unit u = GetCharmed();
@@ -1857,7 +1857,7 @@ namespace Game.Entities
public Gender GetGender() { return (Gender)(byte)m_unitData.Sex; }
public void SetGender(Gender sex) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Sex), (byte)sex); }
public virtual Gender GetNativeGender() { return GetGender(); }
public virtual Gender GetNativeGender() { return GetGender(); }
public virtual void SetNativeGender(Gender gender) { SetGender(gender); }
public void RecalculateObjectScale()
@@ -1869,7 +1869,7 @@ namespace Game.Entities
}
public virtual float GetNativeObjectScale() { return 1.0f; }
public uint GetDisplayId() { return m_unitData.DisplayID; }
public virtual void SetDisplayId(uint modelId, float displayScale = 1f)
@@ -1995,7 +1995,7 @@ namespace Game.Entities
public void SetBattlePetCompanionGUID(ObjectGuid guid) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.BattlePetCompanionGUID), guid); }
public ObjectGuid GetDemonCreatorGUID() { return m_unitData.DemonCreator; }
public void SetDemonCreatorGUID(ObjectGuid guid) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.DemonCreator), guid); }
public ObjectGuid GetCharmerGUID() { return m_unitData.CharmedBy; }
public Unit GetCharmer() { return m_charmer; }
@@ -2097,7 +2097,7 @@ namespace Game.Entities
else
{
var raceEntry = CliDB.ChrRacesStorage.LookupByKey(GetRace());
return (CreatureType)raceEntry.CreatureType;
return (CreatureType)raceEntry.CreatureType;
}
}
else
@@ -2122,6 +2122,8 @@ namespace Game.Entities
public bool IsTotem() { return UnitTypeMask.HasAnyFlag(UnitTypeMask.Totem); }
public bool IsVehicle() { return UnitTypeMask.HasAnyFlag(UnitTypeMask.Vehicle); }
public uint GetContentTuning() { return m_unitData.ContentTuningID; }
public void AddUnitState(UnitState f)
{
m_state |= f;
@@ -2266,7 +2268,7 @@ namespace Game.Entities
}
public AnimTier GetAnimTier() { return (AnimTier)(byte)m_unitData.AnimTier; }
public void SetAnimTier(AnimTier animTier, bool notifyClient = true)
{
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.AnimTier), (byte)animTier);
@@ -2507,7 +2509,7 @@ namespace Game.Entities
}
}
}
Player player = victim.ToPlayer();
if (player != null && player.GetCommandStatus(PlayerCommandStates.God))
return 0;