Fix build

This commit is contained in:
hondacrx
2017-11-13 14:14:59 -05:00
parent 02535a0d47
commit 2960d88aed
6 changed files with 7 additions and 8 deletions
@@ -1684,6 +1684,7 @@ namespace Game.AI
ResetBaseObject(); ResetBaseObject();
break; break;
case SmartActions.CallScriptReset: case SmartActions.CallScriptReset:
SetPhase(0);
OnReset(); OnReset();
break; break;
case SmartActions.SetRangedMovement: case SmartActions.SetRangedMovement:
@@ -554,10 +554,8 @@ namespace Game.Entities
// Hunter trap: Search units which are unfriendly to the trap's owner // Hunter trap: Search units which are unfriendly to the trap's owner
var checker = new NearestUnfriendlyNoTotemUnitInObjectRangeCheck(this, owner, radius); var checker = new NearestUnfriendlyNoTotemUnitInObjectRangeCheck(this, owner, radius);
var searcher = new UnitSearcher(this, checker); var searcher = new UnitSearcher(this, checker);
Cell.VisitGridObjects(this, searcher, radius); Cell.VisitAllObjects(this, searcher, radius);
target = searcher.GetTarget(); target = searcher.GetTarget();
if (target == null)
Cell.VisitWorldObjects(this, searcher, radius);
} }
else else
{ {
+1 -1
View File
@@ -2950,7 +2950,7 @@ namespace Game.Entities
uint runeCooldown = GetRuneBaseCooldown(); uint runeCooldown = GetRuneBaseCooldown();
while (runes < maxRunes) while (runes < maxRunes)
{ {
SetRuneCooldown((byte)runes, runeCooldown, false); SetRuneCooldown((byte)runes, runeCooldown);
++runes; ++runes;
} }
} }
+2 -2
View File
@@ -2850,7 +2850,7 @@ namespace Game.Entities
/**********************************/ /**********************************/
/*************Runes****************/ /*************Runes****************/
/**********************************/ /**********************************/
public void SetRuneCooldown(byte index, uint cooldown, bool casted = false) public void SetRuneCooldown(byte index, uint cooldown)
{ {
m_runes.Cooldown[index] = cooldown; m_runes.Cooldown[index] = cooldown;
m_runes.SetRuneState(index, (cooldown == 0) ? true : false); m_runes.SetRuneState(index, (cooldown == 0) ? true : false);
@@ -2890,7 +2890,7 @@ namespace Game.Entities
{ {
int maxRunes = GetMaxPower(PowerType.Runes); int maxRunes = GetMaxPower(PowerType.Runes);
ResyncRunes data = new ResyncRunes(maxRunes); ResyncRunes data = new ResyncRunes();
data.Runes.Start = (byte)((1 << maxRunes) - 1); data.Runes.Start = (byte)((1 << maxRunes) - 1);
data.Runes.Count = GetRunesState(); data.Runes.Count = GetRunesState();
+1 -1
View File
@@ -2262,7 +2262,7 @@ namespace Game.Entities
SpellHealLog spellHealLog = new SpellHealLog(); SpellHealLog spellHealLog = new SpellHealLog();
spellHealLog.TargetGUID = healInfo.GetTarget().GetGUID(); spellHealLog.TargetGUID = healInfo.GetTarget().GetGUID();
spellHealLog.CasterGUID = GetGUID(); spellHealLog.CasterGUID = healInfo.GetHealer().GetGUID();
spellHealLog.SpellID = healInfo.GetSpellInfo().Id; spellHealLog.SpellID = healInfo.GetSpellInfo().Id;
spellHealLog.Health = healInfo.GetHeal(); spellHealLog.Health = healInfo.GetHeal();
+1 -1
View File
@@ -4183,7 +4183,7 @@ namespace Game.Spells
{ {
if (player.GetRuneCooldown(i) == 0 && runeCost > 0) if (player.GetRuneCooldown(i) == 0 && runeCost > 0)
{ {
player.SetRuneCooldown(i, didHit ? player.GetRuneBaseCooldown() : RuneCooldowns.Miss, true); player.SetRuneCooldown(i, didHit ? player.GetRuneBaseCooldown() : RuneCooldowns.Miss);
--runeCost; --runeCost;
} }
} }