Prevent reseting talents while in queue

azerothcore · Sep 20, 2024 · 4f72be8 · 4f72be8
1 parent 4c8d6a5
commit 4f72be8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/src/solo3v3_sc.cpp b/src/solo3v3_sc.cpp
@@ -717,30 +717,3 @@ bool PlayerScript3v3Arena::CanBattleFieldPort(Player* player, uint8 arenaType, B
 
     return true;
 }
-
-
-// class Spell_SC : public SpellSC
-// {
-// public:
-//     Spell_SC() : SpellSC("Spell_SC") { }
-
-//     bool CanSelectSpecTalent(Spell* spell) override
-//     {
-//         if (!spell)
-//             return false;
-
-//         if (spell->GetCaster()->isPlayer())
-//         {
-//             Player* plr = spell->GetCaster()->ToPlayer();
-
-//             if (plr->InBattlegroundQueueForBattlegroundQueueType((BattlegroundQueueTypeId)BATTLEGROUND_QUEUE_3v3_SOLO) /*||
-//                 plr->InBattlegroundQueueForBattlegroundQueueType((BattlegroundQueueTypeId)BATTLEGROUND_QUEUE_1v1)*/)
-//             {
-//                 plr->GetSession()->SendAreaTriggerMessage("You can't change your talents while in queue for 3v3."); // or 1v1
-//                 return false;
-//             }
-//         }
-
-//         return true;
-//     }
-// }
diff --git a/src/solo3v3_sc.h b/src/solo3v3_sc.h
@@ -25,6 +25,7 @@
 #include "Config.h"
 #include "Battleground.h"
 #include "solo3v3.h"
+#include "Spell.h"
 
 enum Npc3v3Actions {
     NPC_3v3_ACTION_CREATE_ARENA_TEAM = 1,
@@ -288,6 +289,30 @@ class CommandJoinSolo : public CommandScript
     }
 };
 
+ class SpellSolo3v3_SC : public SpellSC
+ {
+ public:
+     SpellSolo3v3_SC() : SpellSC("SpellSolo3v3_SC") { }
+
+     bool CanSelectSpecTalent(Spell* spell) override
+     {
+         if (!spell)
+             return false;
+
+         if (spell->GetCaster()->IsPlayer())
+         {
+             Player* plr = spell->GetCaster()->ToPlayer();
+             if (plr->InBattlegroundQueueForBattlegroundQueueType((BattlegroundQueueTypeId)BATTLEGROUND_QUEUE_3v3_SOLO) || plr->InBattlegroundQueueForBattlegroundQueueType((BattlegroundQueueTypeId)BATTLEGROUND_QUEUE_1v1))
+             {
+                 plr->GetSession()->SendAreaTriggerMessage("You can't change your talents while in queue for solo arena.");
+                 return false;
+             }
+         }
+
+         return true;
+     }
+ };
+
 void AddSC_Solo_3v3_Arena()
 {
     if (!ArenaTeam::ArenaSlotByType.count(ARENA_TEAM_SOLO_3v3))
@@ -312,4 +337,5 @@ void AddSC_Solo_3v3_Arena()
     new PlayerScript3v3Arena();
     new Arena_SC();
     new CommandJoinSolo();
+    new SpellSolo3v3_SC();
 }