Some fixes

This commit is contained in:
hondacrx
2021-09-08 23:41:06 -04:00
parent 0078a136a4
commit ed98f4a2a4
5 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -704,7 +704,7 @@ namespace Game.Entities
return Global.ObjectMgr.GetItemTemplate(GetEntry());
}
public Player GetOwner()
public override Player GetOwner()
{
return Global.ObjAccessor.FindPlayer(GetOwnerGUID());
}
@@ -2475,7 +2475,7 @@ namespace Game.Entities
public BonusData GetBonus() { return _bonusData; }
public ObjectGuid GetOwnerGUID() { return m_itemData.Owner; }
public override ObjectGuid GetOwnerGUID() { return m_itemData.Owner; }
public void SetOwnerGUID(ObjectGuid guid) { SetUpdateFieldValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.Owner), guid); }
public ObjectGuid GetContainedIn() { return m_itemData.ContainedIn; }
public void SetContainedIn(ObjectGuid guid) { SetUpdateFieldValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.ContainedIn), guid); }
+1 -1
View File
@@ -1611,7 +1611,7 @@ namespace Game.Entities
return Global.ObjAccessor.GetUnit(this, GetOwnerGUID());
}
public Unit GetCharmerOrOwner()
public virtual Unit GetCharmerOrOwner()
{
Unit unit = ToUnit();
if (unit != null)
+1 -1
View File
@@ -1835,7 +1835,7 @@ namespace Game.Entities
return Global.ObjAccessor.GetUnit(this, charmerid);
return null;
}
public Unit GetCharmerOrOwner()
public override Unit GetCharmerOrOwner()
{
return !GetCharmerGUID().IsEmpty() ? GetCharmer() : GetOwner();
}
+1 -1
View File
@@ -6560,7 +6560,7 @@ namespace Game.Spells
// check if gameobject ignores LOS
GameObject gobCaster = m_caster.ToGameObject();
if (gobCaster != null)
if (!gobCaster.GetGoInfo().GetRequireLOS())
if (gobCaster.GetGoInfo().GetRequireLOS() == 0)
return true;
// if spell is triggered, need to check for LOS disable on the aura triggering it and inherit that behaviour
+1 -1
View File
@@ -3669,7 +3669,7 @@ namespace Game.Spells
switch (spellEffectInfo.ApplyAuraName)
{
// has other non positive effect?
// then it should be marked negative despite of targets (ex 8510, 8511, 8893, 10267)
// then it should be marked negative if has same target as negative effect (ex 8510, 8511, 8893, 10267)
case AuraType.Dummy:
case AuraType.ModStun:
case AuraType.ModFear: