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

Some Cleanups from porting.

Browse Source
This commit is contained in:
hondacrx
2021-08-23 14:29:45 -04:00
parent 00e0fa85e2
commit 663f082640
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Achievements/CriteriaHandler.cs
+1
View File
@@ -4277,6 +4277,7 @@ namespace Game.Achievements
{ {
Log.outError(LogFilter.Sql, "Table `criteria_data` (Entry: {0} Type: {1}) for data type CRITERIA_DATA_TYPE_MAP_ID ({2}) contains an unknown map entry in value1 ({3}), ignored.", Log.outError(LogFilter.Sql, "Table `criteria_data` (Entry: {0} Type: {1}) for data type CRITERIA_DATA_TYPE_MAP_ID ({2}) contains an unknown map entry in value1 ({3}), ignored.",
criteria.Id, criteria.Entry.Type, DataType, MapId.Id); criteria.Id, criteria.Entry.Type, DataType, MapId.Id);
return false;
} }
return true; return true;
case CriteriaDataType.SPlayerClassRace: case CriteriaDataType.SPlayerClassRace:
Source/Game/Spells/Auras/Aura.cs
+5 -5
View File
@@ -2588,7 +2588,7 @@ namespace Game.Spells
selectionType = SpellTargetCheckTypes.Enemy; selectionType = SpellTargetCheckTypes.Enemy;
break; break;
case SpellEffectName.ApplyAreaAuraPet: case SpellEffectName.ApplyAreaAuraPet:
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), caster, condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), refe, condList))
targetList.Add(GetUnitOwner()); targetList.Add(GetUnitOwner());
goto case SpellEffectName.ApplyAreaAuraOwner; goto case SpellEffectName.ApplyAreaAuraOwner;
case SpellEffectName.ApplyAreaAuraOwner: case SpellEffectName.ApplyAreaAuraOwner:
@@ -2596,7 +2596,7 @@ namespace Game.Spells
Unit owner = GetUnitOwner().GetCharmerOrOwner(); Unit owner = GetUnitOwner().GetCharmerOrOwner();
if (owner != null) if (owner != null)
if (GetUnitOwner().IsWithinDistInMap(owner, radius)) if (GetUnitOwner().IsWithinDistInMap(owner, radius))
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(owner, caster, condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(owner, refe, condList))
targetList.Add(owner); targetList.Add(owner);
break; break;
} }
@@ -2604,13 +2604,13 @@ namespace Game.Spells
{ {
Unit pet = Global.ObjAccessor.GetUnit(GetUnitOwner(), GetUnitOwner().GetPetGUID()); Unit pet = Global.ObjAccessor.GetUnit(GetUnitOwner(), GetUnitOwner().GetPetGUID());
if (pet != null) if (pet != null)
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(pet, caster, condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(pet, refe, condList))
targetList.Add(pet); targetList.Add(pet);
break; break;
} }
case SpellEffectName.ApplyAreaAuraSummons: case SpellEffectName.ApplyAreaAuraSummons:
{ {
if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), caster, condList)) if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), refe, condList))
targetList.Add(GetUnitOwner()); targetList.Add(GetUnitOwner());
selectionType = SpellTargetCheckTypes.Summoned; selectionType = SpellTargetCheckTypes.Summoned;
@@ -2620,7 +2620,7 @@ namespace Game.Spells
if (selectionType != SpellTargetCheckTypes.Default) if (selectionType != SpellTargetCheckTypes.Default)
{ {
WorldObjectSpellAreaTargetCheck check = new(radius, GetUnitOwner(), caster, caster, GetSpellInfo(), selectionType, condList, SpellTargetObjectTypes.Unit); WorldObjectSpellAreaTargetCheck check = new(radius, GetUnitOwner(), refe, GetUnitOwner(), GetSpellInfo(), selectionType, condList, SpellTargetObjectTypes.Unit);
UnitListSearcher searcher = new(GetUnitOwner(), targetList, check); UnitListSearcher searcher = new(GetUnitOwner(), targetList, check);
Cell.VisitAllObjects(GetUnitOwner(), searcher, radius); Cell.VisitAllObjects(GetUnitOwner(), searcher, radius);