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

Core/Spells: Changed Spell::SendCastResult arguments to signed ints to match packet structure

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/2965d201ab5580a7c71279701b8523064a159077)
This commit is contained in:
hondacrx
2021-10-10 16:34:07 -04:00
parent 6c896fdb21
commit bb234fa4bd
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Scripting/SpellScript.cs
+1 -1
View File
@@ -827,7 +827,7 @@ namespace Game.Scripting
public SpellInfo GetTriggeringSpell() { return m_spell.m_triggeredByAuraSpell; } public SpellInfo GetTriggeringSpell() { return m_spell.m_triggeredByAuraSpell; }
// finishes spellcast prematurely with selected error message // finishes spellcast prematurely with selected error message
public void FinishCast(SpellCastResult result, uint? param1 = null, uint? param2 = null) public void FinishCast(SpellCastResult result, int? param1 = null, int? param2 = null)
{ {
m_spell.SendCastResult(result, param1, param2); m_spell.SendCastResult(result, param1, param2);
m_spell.Finish(result == SpellCastResult.SpellCastOk); m_spell.Finish(result == SpellCastResult.SpellCastOk);
Source/Game/Spells/Spell.cs
+28 -28
View File
@@ -2285,7 +2285,7 @@ namespace Game.Spells
if (Convert.ToBoolean(_triggeredCastFlags & TriggerCastFlags.IgnoreComboPoints) || m_CastItem != null) if (Convert.ToBoolean(_triggeredCastFlags & TriggerCastFlags.IgnoreComboPoints) || m_CastItem != null)
m_needComboPoints = false; m_needComboPoints = false;
uint param1 = 0, param2 = 0; int param1 = 0, param2 = 0;
SpellCastResult result = CheckCast(true, ref param1, ref param2); SpellCastResult result = CheckCast(true, ref param1, ref param2);
// target is checked in too many locations and with different results to handle each of them // target is checked in too many locations and with different results to handle each of them
// handle just the general SPELL_FAILED_BAD_TARGETS result which is the default result for most DBC target checks // handle just the general SPELL_FAILED_BAD_TARGETS result which is the default result for most DBC target checks
@@ -2534,7 +2534,7 @@ namespace Game.Spells
// skip check if done already (for instant cast spells for example) // skip check if done already (for instant cast spells for example)
if (!skipCheck) if (!skipCheck)
{ {
void cleanupSpell(SpellCastResult result, uint? param1 = null, uint? param2 = null) void cleanupSpell(SpellCastResult result, int? param1 = null, int? param2 = null)
{ {
SendCastResult(result, param1, param2); SendCastResult(result, param1, param2);
SendInterrupted(0); SendInterrupted(0);
@@ -2547,7 +2547,7 @@ namespace Game.Spells
} }
uint param1 = 0, param2 = 0; int param1 = 0, param2 = 0;
SpellCastResult castResult = CheckCast(false, ref param1, ref param2); SpellCastResult castResult = CheckCast(false, ref param1, ref param2);
if (castResult != SpellCastResult.SpellCastOk) if (castResult != SpellCastResult.SpellCastOk)
{ {
@@ -3204,7 +3204,7 @@ namespace Game.Spells
unitCaster.AttackStop(); unitCaster.AttackStop();
} }
static void FillSpellCastFailedArgs<T>(T packet, ObjectGuid castId, SpellInfo spellInfo, SpellCastResult result, SpellCustomErrors customError, uint? param1, uint? param2, Player caster) where T : CastFailedBase static void FillSpellCastFailedArgs<T>(T packet, ObjectGuid castId, SpellInfo spellInfo, SpellCastResult result, SpellCustomErrors customError, int? param1, int? param2, Player caster) where T : CastFailedBase
{ {
packet.CastID = castId; packet.CastID = castId;
packet.SpellID = (int)spellInfo.Id; packet.SpellID = (int)spellInfo.Id;
@@ -3399,7 +3399,7 @@ namespace Game.Spells
} }
} }
public void SendCastResult(SpellCastResult result, uint? param1 = null, uint? param2 = null) public void SendCastResult(SpellCastResult result, int? param1 = null, int? param2 = null)
{ {
if (result == SpellCastResult.SpellCastOk) if (result == SpellCastResult.SpellCastOk)
return; return;
@@ -3419,7 +3419,7 @@ namespace Game.Spells
m_caster.ToPlayer().SendPacket(castFailed); m_caster.ToPlayer().SendPacket(castFailed);
} }
public void SendPetCastResult(SpellCastResult result, uint? param1 = null, uint? param2 = null) public void SendPetCastResult(SpellCastResult result, int? param1 = null, int? param2 = null)
{ {
if (result == SpellCastResult.SpellCastOk) if (result == SpellCastResult.SpellCastOk)
return; return;
@@ -3436,7 +3436,7 @@ namespace Game.Spells
owner.ToPlayer().SendPacket(petCastFailed); owner.ToPlayer().SendPacket(petCastFailed);
} }
public static void SendCastResult(Player caster, SpellInfo spellInfo, SpellCastVisual spellVisual, ObjectGuid castCount, SpellCastResult result, SpellCustomErrors customError = SpellCustomErrors.None, uint? param1 = null, uint? param2 = null) public static void SendCastResult(Player caster, SpellInfo spellInfo, SpellCastVisual spellVisual, ObjectGuid castCount, SpellCastResult result, SpellCustomErrors customError = SpellCustomErrors.None, int? param1 = null, int? param2 = null)
{ {
if (result == SpellCastResult.SpellCastOk) if (result == SpellCastResult.SpellCastOk)
return; return;
@@ -4328,11 +4328,11 @@ namespace Game.Spells
public SpellCastResult CheckCast(bool strict) public SpellCastResult CheckCast(bool strict)
{ {
uint param1 = 0, param2 = 0; int param1 = 0, param2 = 0;
return CheckCast(strict, ref param1, ref param2); return CheckCast(strict, ref param1, ref param2);
} }
public SpellCastResult CheckCast(bool strict, ref uint param1, ref uint param2) public SpellCastResult CheckCast(bool strict, ref int param1, ref int param2)
{ {
SpellCastResult castResult; SpellCastResult castResult;
@@ -5194,7 +5194,7 @@ namespace Game.Spells
if (playerCaster.GetSpellHistory().HasCooldown(talent.SpellID)) if (playerCaster.GetSpellHistory().HasCooldown(talent.SpellID))
{ {
param1 = talent.SpellID; param1 = (int)talent.SpellID;
return SpellCastResult.CantUntalent; return SpellCastResult.CantUntalent;
} }
break; break;
@@ -5430,7 +5430,7 @@ namespace Game.Spells
return CheckCast(true); return CheckCast(true);
} }
SpellCastResult CheckCasterAuras(ref uint param1) SpellCastResult CheckCasterAuras(ref int param1)
{ {
Unit unitCaster = (m_originalCaster ? m_originalCaster : m_caster.ToUnit()); Unit unitCaster = (m_originalCaster ? m_originalCaster : m_caster.ToUnit());
if (unitCaster == null) if (unitCaster == null)
@@ -5468,7 +5468,7 @@ namespace Game.Spells
}*/ }*/
// spell has attribute usable while having a cc state, check if caster has allowed mechanic auras, another mechanic types must prevent cast spell // spell has attribute usable while having a cc state, check if caster has allowed mechanic auras, another mechanic types must prevent cast spell
SpellCastResult mechanicCheck(AuraType auraType, ref uint _param1) SpellCastResult mechanicCheck(AuraType auraType, ref int _param1)
{ {
bool foundNotMechanic = false; bool foundNotMechanic = false;
var auras = unitCaster.GetAuraEffectsByType(auraType); var auras = unitCaster.GetAuraEffectsByType(auraType);
@@ -5480,9 +5480,9 @@ namespace Game.Spells
foundNotMechanic = true; foundNotMechanic = true;
// fill up aura mechanic info to send client proper error message // fill up aura mechanic info to send client proper error message
_param1 = (uint)aurEff.GetSpellEffectInfo().Mechanic; _param1 = (int)aurEff.GetSpellEffectInfo().Mechanic;
if (_param1 == 0) if (_param1 == 0)
_param1 = (uint)aurEff.GetSpellInfo().Mechanic; _param1 = (int)aurEff.GetSpellInfo().Mechanic;
break; break;
} }
@@ -5554,7 +5554,7 @@ namespace Game.Spells
return SpellCastResult.SpellCastOk; return SpellCastResult.SpellCastOk;
} }
bool CheckSpellCancelsAuraEffect(AuraType auraType, ref uint param1) bool CheckSpellCancelsAuraEffect(AuraType auraType, ref int param1)
{ {
Unit unitCaster = (m_originalCaster ? m_originalCaster : m_caster.ToUnit()); Unit unitCaster = (m_originalCaster ? m_originalCaster : m_caster.ToUnit());
if (unitCaster == null) if (unitCaster == null)
@@ -5570,9 +5570,9 @@ namespace Game.Spells
if (m_spellInfo.SpellCancelsAuraEffect(aurEff)) if (m_spellInfo.SpellCancelsAuraEffect(aurEff))
continue; continue;
param1 = (uint)aurEff.GetSpellEffectInfo().Mechanic; param1 = (int)aurEff.GetSpellEffectInfo().Mechanic;
if (param1 == 0) if (param1 == 0)
param1 = (uint)aurEff.GetSpellInfo().Mechanic; param1 = (int)aurEff.GetSpellInfo().Mechanic;
return false; return false;
} }
@@ -5580,42 +5580,42 @@ namespace Game.Spells
return true; return true;
} }
bool CheckSpellCancelsCharm(ref uint param1) bool CheckSpellCancelsCharm(ref int param1)
{ {
return CheckSpellCancelsAuraEffect(AuraType.ModCharm, ref param1) || return CheckSpellCancelsAuraEffect(AuraType.ModCharm, ref param1) ||
CheckSpellCancelsAuraEffect(AuraType.AoeCharm, ref param1) || CheckSpellCancelsAuraEffect(AuraType.AoeCharm, ref param1) ||
CheckSpellCancelsAuraEffect(AuraType.ModPossess, ref param1); CheckSpellCancelsAuraEffect(AuraType.ModPossess, ref param1);
} }
bool CheckSpellCancelsStun(ref uint param1) bool CheckSpellCancelsStun(ref int param1)
{ {
return CheckSpellCancelsAuraEffect(AuraType.ModStun, ref param1) && return CheckSpellCancelsAuraEffect(AuraType.ModStun, ref param1) &&
CheckSpellCancelsAuraEffect(AuraType.ModStunDisableGravity, ref param1); CheckSpellCancelsAuraEffect(AuraType.ModStunDisableGravity, ref param1);
} }
bool CheckSpellCancelsSilence(ref uint param1) bool CheckSpellCancelsSilence(ref int param1)
{ {
return CheckSpellCancelsAuraEffect(AuraType.ModSilence, ref param1) || return CheckSpellCancelsAuraEffect(AuraType.ModSilence, ref param1) ||
CheckSpellCancelsAuraEffect(AuraType.ModPacifySilence, ref param1); CheckSpellCancelsAuraEffect(AuraType.ModPacifySilence, ref param1);
} }
bool CheckSpellCancelsPacify(ref uint param1) bool CheckSpellCancelsPacify(ref int param1)
{ {
return CheckSpellCancelsAuraEffect(AuraType.ModPacify, ref param1) || return CheckSpellCancelsAuraEffect(AuraType.ModPacify, ref param1) ||
CheckSpellCancelsAuraEffect(AuraType.ModPacifySilence, ref param1); CheckSpellCancelsAuraEffect(AuraType.ModPacifySilence, ref param1);
} }
bool CheckSpellCancelsFear(ref uint param1) bool CheckSpellCancelsFear(ref int param1)
{ {
return CheckSpellCancelsAuraEffect(AuraType.ModFear, ref param1); return CheckSpellCancelsAuraEffect(AuraType.ModFear, ref param1);
} }
bool CheckSpellCancelsConfuse(ref uint param1) bool CheckSpellCancelsConfuse(ref int param1)
{ {
return CheckSpellCancelsAuraEffect(AuraType.ModConfuse, ref param1); return CheckSpellCancelsAuraEffect(AuraType.ModConfuse, ref param1);
} }
bool CheckSpellCancelsNoActions(ref uint param1) bool CheckSpellCancelsNoActions(ref int param1)
{ {
return CheckSpellCancelsAuraEffect(AuraType.ModNoActions, ref param1); return CheckSpellCancelsAuraEffect(AuraType.ModNoActions, ref param1);
} }
@@ -5855,7 +5855,7 @@ namespace Game.Spells
return SpellCastResult.SpellCastOk; return SpellCastResult.SpellCastOk;
} }
SpellCastResult CheckItems(ref uint param1, ref uint param2) SpellCastResult CheckItems(ref int param1, ref int param2)
{ {
Player player = m_caster.ToPlayer(); Player player = m_caster.ToPlayer();
if (!player) if (!player)
@@ -5998,7 +5998,7 @@ namespace Game.Spells
} }
if (!player.HasItemCount(itemid, itemcount)) if (!player.HasItemCount(itemid, itemcount))
{ {
param1 = itemid; param1 = (int)itemid;
return SpellCastResult.Reagents; return SpellCastResult.Reagents;
} }
} }
@@ -6226,7 +6226,7 @@ namespace Game.Spells
//make sure the player has the required ores in inventory //make sure the player has the required ores in inventory
if (item.GetCount() < 5) if (item.GetCount() < 5)
{ {
param1 = item.GetEntry(); param1 = (int)item.GetEntry();
param2 = 5; param2 = 5;
return SpellCastResult.NeedMoreItems; return SpellCastResult.NeedMoreItems;
} }
@@ -6254,7 +6254,7 @@ namespace Game.Spells
//make sure the player has the required herbs in inventory //make sure the player has the required herbs in inventory
if (item.GetCount() < 5) if (item.GetCount() < 5)
{ {
param1 = item.GetEntry(); param1 = (int)item.GetEntry();
param2 = 5; param2 = 5;
return SpellCastResult.NeedMoreItems; return SpellCastResult.NeedMoreItems;
} }