aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2025-02-01 00:32:34 +0100
committerOvahlord <dreadkiller@gmx.de>2025-02-01 05:39:34 +0100
commit02b3456b055cc81e5e71cdadab66cfe2630f5166 (patch)
tree277112e36e5ad3067e39fefb93130a437f086957 /src/server/scripts/Commands
parent30dc45e2dbd693e8e8165b7fea8fa3867bd44773 (diff)
Core/Spells: Remove manual spell guid creation in scripts
(cherry picked from commit dbd761d20a1b2343ffd8bb778185a649e551b48a) # Conflicts: # sql/updates/world/cata_classic/2025_02_01_00_world.sql # src/server/scripts/Commands/cs_misc.cpp
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index bf8b23f2e7c..c9dda180791 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -306,15 +306,10 @@ public:
return false;
}
- if(!spell)
+ if (!spell)
return false;
- ObjectGuid castId = ObjectGuid::Create<HighGuid::Cast>(SPELL_CAST_SOURCE_NORMAL, target->GetMapId(), spell->Id, target->GetMap()->GenerateLowGuid<HighGuid::Cast>());
- AuraCreateInfo createInfo(castId, spell, target->GetMap()->GetDifficultyID(), MAX_EFFECT_MASK, target);
- createInfo.SetCaster(target);
-
- Aura::TryRefreshStackOrCreate(createInfo);
-
+ target->AddAura(spell, MAX_EFFECT_MASK, target);
return true;
}
@@ -957,10 +952,7 @@ public:
return false;
if (Player* caster = handler->GetSession()->GetPlayer())
- {
- ObjectGuid castId = ObjectGuid::Create<HighGuid::Cast>(SPELL_CAST_SOURCE_NORMAL, player->GetMapId(), SPELL_UNSTUCK_ID, player->GetMap()->GenerateLowGuid<HighGuid::Cast>());
- Spell::SendCastResult(caster, spellInfo, { SPELL_UNSTUCK_VISUAL }, castId, SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW);
- }
+ caster->SendDirectMessage(WorldPackets::Misc::DisplayGameError(GameError::ERR_CLIENT_LOCKED_OUT).Write());
return false;
}