Misc fixes

This commit is contained in:
hondacrx
2021-04-28 11:00:29 -04:00
parent 5b0391b1d9
commit be9da02534
3 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -75,7 +75,7 @@ namespace Framework.Constants
public const uint mmapMagic = 0x4D4D4150; // 'MMAP' public const uint mmapMagic = 0x4D4D4150; // 'MMAP'
public const int mmapVersion = 10; public const int mmapVersion = 10;
public const string VMapMagic = "VMAP_4.9"; public const string VMapMagic = "VMAP_4.A";
public const float VMAPInvalidHeightValue = -200000.0f; public const float VMAPInvalidHeightValue = -200000.0f;
} }
+4 -3
View File
@@ -2840,14 +2840,15 @@ namespace Game.Entities
if (IsTypeId(TypeId.Player)) if (IsTypeId(TypeId.Player))
ToPlayer().SendAutoRepeatCancel(this); ToPlayer().SendAutoRepeatCancel(this);
m_currentSpells[spellType] = null;
if (spell.GetState() != SpellState.Finished) if (spell.GetState() != SpellState.Finished)
spell.Cancel(); spell.Cancel();
else
spell.SetReferencedFromCurrent(false);
if (IsCreature() && IsAIEnabled) if (IsCreature() && IsAIEnabled)
ToCreature().GetAI().OnSpellCastInterrupt(spell.GetSpellInfo()); ToCreature().GetAI().OnSpellCastInterrupt(spell.GetSpellInfo());
m_currentSpells[spellType] = null;
spell.SetReferencedFromCurrent(false);
} }
} }
public void UpdateInterruptMask() public void UpdateInterruptMask()
+1 -1
View File
@@ -725,7 +725,7 @@ namespace Scripts.Spells.Shaman
[Script] // 192223 - Liquid Magma Totem (erupting hit spell) [Script] // 192223 - Liquid Magma Totem (erupting hit spell)
class spell_sha_liquid_magma_totem : SpellScript class spell_sha_liquid_magma_totem : SpellScript
{ {
bool Validate(SpellInfo spellInfo) public override bool Validate(SpellInfo spellInfo)
{ {
return ValidateSpellInfo(SpellIds.LiquidMagmaHit); return ValidateSpellInfo(SpellIds.LiquidMagmaHit);
} }