fix(premium): fix incorrect spell type for hearthstone

instead of squire

lua_scripts/MWPremium/mwpremium.lua

@@ -2,17 +2,24 @@ local PLAYER_EVENT_ON_LOGIN = 3
 local PLAYER_EVENT_ON_SPELL_CAST = 5
 local PLAYER_EVENT_ON_LOGOUT = 4
 local PLAYER_EVENT_ON_COMMAND = 42
+local PLAYER_EVENT_ON_BEFORE_TELEPORT = 67
 
-local PREMIUM_FLAG_INDEX = 100
 
 local ACCOUNT_FLAG_RECURRING_BILLING = 8192
 
 local SUMMON_SQUIRE_SPELL_ID = 80000
+local HEARTHSTONE_SPELL_ID = 8690
 
 local SQUIRE_CREATURE_TEMPLATE_ID = 9000001
 
+local ALLIANCE_AUCTIONEER_CREATURE_TEMPLATE_ID = 15659
+local HORDE_AUCTIONEER_CREATURE_TEMPLATE_ID = 8673
+
 local NPC_TEXT_ID = 10000000
 
+local premiums_table = {}
+local squires_table = {}
+
 ---todo extract to utils
 ---@param inputstr string
 ---@param separator string
@@ -30,20 +37,18 @@ end
 
 ---@return boolean
 local function IsPremium(player)
-    return player:HasFlag(PREMIUM_FLAG_INDEX, 1)
+    return premiums_table[player:GetAccountId()] == true
 end
 
 local function OnPremiumPlayer(player)
-    if not IsPremium(player) then
-        return
-    end
-
     player:SendAreaTriggerMessage(
         'На вашем аккаунте активна подписка Premium! Благодарим за поддержку проекта MoonWell.')
 
     player:LearnSpell(SUMMON_SQUIRE_SPELL_ID)
     player:SendBroadcastMessage("Милостью Элуны вам была выдана способность |cff71d5ff|Hspell:" ..
         SUMMON_SQUIRE_SPELL_ID .. "|h[" .. "Призыв Оруженосца]h|")
+
+    player:ResetSpellCooldown(HEARTHSTONE_SPELL_ID)
 end
 
 local function RefreshPremiumStatus(player)
@@ -58,7 +63,7 @@ local function RefreshPremiumStatus(player)
         local flags = query:GetUInt32(0)
 
         if HasFlag(flags, ACCOUNT_FLAG_RECURRING_BILLING) then
-            player:SetFlag(PREMIUM_FLAG_INDEX, 1)
+            premiums_table[player:GetAccountId()] = true
 
             OnPremiumPlayer(player)
 
@@ -108,7 +113,15 @@ end
 local function OnSummonSquireCast(player)
     local x, y, z, o = player:GetLocation()
 
+    if (squires_table[player:GetGUIDLow()] ~= nil) then
+        local existing_squire = player:GetMap():GetWorldObject(squires_table[player:GetGUIDLow()])
+        if (existing_squire ~= nil) then
+            existing_squire:DespawnOrUnsummon()
+        end
+    end
+
     local squire = player:SpawnCreature(SQUIRE_CREATURE_TEMPLATE_ID, x + 1, y + 1, z, o, 1, 30000)
+    squires_table[player:GetGUIDLow()] = squire:GetGUID()
 
     if squire then
         squire:SetFaction(player:GetFaction())
@@ -147,7 +160,14 @@ local function OnGossipSelect(event, player, creature, sender, intid, code)
         end
 
         if intid == 3 then
-	    player:SendAuctionMenu(creature)
+            local x, y, z, o = player:GetLocation()
+            local auctioneer_template = player:GetTeam() == 0 and ALLIANCE_AUCTIONEER_CREATURE_TEMPLATE_ID or
+                HORDE_AUCTIONEER_CREATURE_TEMPLATE_ID
+            local auctioneer = player:SpawnCreature(auctioneer_template, x, y, z, o, 1, 30000)
+            auctioneer:SetDisplayId(11686)
+
+            player:SendAuctionMenu(auctioneer)
+
             player:GossipComplete()
         end
 
@@ -161,6 +181,18 @@ end
 
 local function OnLogout(event, player)
     player:RemoveSpell(SUMMON_SQUIRE_SPELL_ID)
+    squires_table[player:GetGUID()] = nil
+end
+
+local function OnBeforeTeleport(event, player, mapid, x, y, z, orientation, options, target)
+    if not IsPremium(player) then return end
+
+    -- Get current generic spell (SpellType 1)
+    local current_spell = player:GetCurrentSpell(1)
+
+    if current_spell ~= nil and current_spell:GetEntry() == HEARTHSTONE_SPELL_ID then
+        player:ResetSpellCooldown(HEARTHSTONE_SPELL_ID)
+    end
 end
 
 RegisterCreatureGossipEvent(SQUIRE_CREATURE_TEMPLATE_ID, 1, OnGossipHello)
@@ -169,4 +201,4 @@ RegisterPlayerEvent(PLAYER_EVENT_ON_LOGIN, OnLogin)
 RegisterPlayerEvent(PLAYER_EVENT_ON_LOGOUT, OnLogout)
 RegisterPlayerEvent(PLAYER_EVENT_ON_COMMAND, OnCommand)
 RegisterPlayerEvent(PLAYER_EVENT_ON_SPELL_CAST, OnSpellCast)
-
+RegisterPlayerEvent(PLAYER_EVENT_ON_BEFORE_TELEPORT, OnBeforeTeleport)

modules/mod-eluna/src/ElunaLuaEngine_SC.cpp

@@ -244,15 +244,13 @@ public:
 class Eluna_AllMapScript : public AllMapScript
 {
 public:
-    Eluna_AllMapScript() : AllMapScript("Eluna_AllMapScript", {
+    Eluna_AllMapScript() : AllMapScript("Eluna_AllMapScript", {ALLMAPHOOK_ON_BEFORE_CREATE_INSTANCE_SCRIPT,
-        ALLMAPHOOK_ON_BEFORE_CREATE_INSTANCE_SCRIPT,
                                                                ALLMAPHOOK_ON_DESTROY_INSTANCE,
                                                                ALLMAPHOOK_ON_CREATE_MAP,
                                                                ALLMAPHOOK_ON_DESTROY_MAP,
                                                                ALLMAPHOOK_ON_PLAYER_ENTER_ALL,
                                                                ALLMAPHOOK_ON_PLAYER_LEAVE_ALL,
-        ALLMAPHOOK_ON_MAP_UPDATE
+                                                               ALLMAPHOOK_ON_MAP_UPDATE}) {}
-    }) { }
 
     void OnBeforeCreateInstanceScript(InstanceMap *instanceMap, InstanceScript **instanceData, bool /*load*/, std::string /*data*/, uint32 /*completedEncounterMask*/) override
     {
@@ -294,12 +292,10 @@ public:
 class Eluna_AuctionHouseScript : public AuctionHouseScript
 {
 public:
-    Eluna_AuctionHouseScript() : AuctionHouseScript("Eluna_AuctionHouseScript", {
+    Eluna_AuctionHouseScript() : AuctionHouseScript("Eluna_AuctionHouseScript", {AUCTIONHOUSEHOOK_ON_AUCTION_ADD,
-        AUCTIONHOUSEHOOK_ON_AUCTION_ADD,
                                                                                  AUCTIONHOUSEHOOK_ON_AUCTION_REMOVE,
                                                                                  AUCTIONHOUSEHOOK_ON_AUCTION_SUCCESSFUL,
-        AUCTIONHOUSEHOOK_ON_AUCTION_EXPIRE
+                                                                                 AUCTIONHOUSEHOOK_ON_AUCTION_EXPIRE}) {}
-    }) { }
 
     void OnAuctionAdd(AuctionHouseObject *ah, AuctionEntry *entry) override
     {
@@ -325,12 +321,10 @@ public:
 class Eluna_BGScript : public BGScript
 {
 public:
-    Eluna_BGScript() : BGScript("Eluna_BGScript", {
+    Eluna_BGScript() : BGScript("Eluna_BGScript", {ALLBATTLEGROUNDHOOK_ON_BATTLEGROUND_START,
-        ALLBATTLEGROUNDHOOK_ON_BATTLEGROUND_START,
                                                    ALLBATTLEGROUNDHOOK_ON_BATTLEGROUND_END,
                                                    ALLBATTLEGROUNDHOOK_ON_BATTLEGROUND_DESTROY,
-        ALLBATTLEGROUNDHOOK_ON_BATTLEGROUND_CREATE
+                                                   ALLBATTLEGROUNDHOOK_ON_BATTLEGROUND_CREATE}) {}
-    }) { }
 
     void OnBattlegroundStart(Battleground *bg) override
     {
@@ -356,9 +350,7 @@ public:
 class Eluna_CommandSC : public CommandSC
 {
 public:
-    Eluna_CommandSC() : CommandSC("Eluna_CommandSC", {
+    Eluna_CommandSC() : CommandSC("Eluna_CommandSC", {ALLCOMMANDHOOK_ON_TRY_EXECUTE_COMMAND}) {}
-        ALLCOMMANDHOOK_ON_TRY_EXECUTE_COMMAND
-    }) { }
 
     bool OnTryExecuteCommand(ChatHandler &handler, std::string_view cmdStr) override
     {
@@ -395,10 +387,8 @@ public:
 class Eluna_GameEventScript : public GameEventScript
 {
 public:
-    Eluna_GameEventScript() : GameEventScript("Eluna_GameEventScript", {
+    Eluna_GameEventScript() : GameEventScript("Eluna_GameEventScript", {GAMEEVENTHOOK_ON_START,
-        GAMEEVENTHOOK_ON_START,
+                                                                        GAMEEVENTHOOK_ON_STOP}) {}
-        GAMEEVENTHOOK_ON_STOP
-    }) { }
 
     void OnStart(uint16 eventID) override
     {
@@ -414,14 +404,12 @@ public:
 class Eluna_GroupScript : public GroupScript
 {
 public:
-    Eluna_GroupScript() : GroupScript("Eluna_GroupScript", {
+    Eluna_GroupScript() : GroupScript("Eluna_GroupScript", {GROUPHOOK_ON_ADD_MEMBER,
-        GROUPHOOK_ON_ADD_MEMBER,
                                                             GROUPHOOK_ON_INVITE_MEMBER,
                                                             GROUPHOOK_ON_REMOVE_MEMBER,
                                                             GROUPHOOK_ON_CHANGE_LEADER,
                                                             GROUPHOOK_ON_DISBAND,
-        GROUPHOOK_ON_CREATE
+                                                            GROUPHOOK_ON_CREATE}) {}
-    }) { }
 
     void OnAddMember(Group *group, ObjectGuid guid) override
     {
@@ -457,8 +445,7 @@ public:
 class Eluna_GuildScript : public GuildScript
 {
 public:
-    Eluna_GuildScript() : GuildScript("Eluna_GuildScript", {
+    Eluna_GuildScript() : GuildScript("Eluna_GuildScript", {GUILDHOOK_ON_ADD_MEMBER,
-        GUILDHOOK_ON_ADD_MEMBER,
                                                             GUILDHOOK_ON_REMOVE_MEMBER,
                                                             GUILDHOOK_ON_MOTD_CHANGED,
                                                             GUILDHOOK_ON_INFO_CHANGED,
@@ -468,8 +455,7 @@ public:
                                                             GUILDHOOK_ON_MEMBER_DEPOSIT_MONEY,
                                                             GUILDHOOK_ON_ITEM_MOVE,
                                                             GUILDHOOK_ON_EVENT,
-        GUILDHOOK_ON_BANK_EVENT
+                                                            GUILDHOOK_ON_BANK_EVENT}) {}
-    }) { }
 
     void OnAddMember(Guild *guild, Player *player, uint8 &plRank) override
     {
@@ -531,9 +517,7 @@ public:
 class Eluna_LootScript : public LootScript
 {
 public:
-    Eluna_LootScript() : LootScript("Eluna_LootScript", {
+    Eluna_LootScript() : LootScript("Eluna_LootScript", {LOOTHOOK_ON_LOOT_MONEY}) {}
-        LOOTHOOK_ON_LOOT_MONEY
-    }) { }
 
     void OnLootMoney(Player *player, uint32 gold) override
     {
@@ -544,9 +528,7 @@ public:
 class Eluna_MiscScript : public MiscScript
 {
 public:
-    Eluna_MiscScript() : MiscScript("Eluna_MiscScript", {
+    Eluna_MiscScript() : MiscScript("Eluna_MiscScript", {MISCHOOK_GET_DIALOG_STATUS}) {}
-        MISCHOOK_GET_DIALOG_STATUS
-    }) { }
 
     void GetDialogStatus(Player *player, Object *questgiver) override
     {
@@ -560,9 +542,7 @@ public:
 class Eluna_PetScript : public PetScript
 {
 public:
-    Eluna_PetScript() : PetScript("Eluna_PetScript", {
+    Eluna_PetScript() : PetScript("Eluna_PetScript", {PETHOOK_ON_PET_ADD_TO_WORLD}) {}
-        PETHOOK_ON_PET_ADD_TO_WORLD
-    }) { }
 
     void OnPetAddToWorld(Pet *pet) override
     {
@@ -573,8 +553,7 @@ public:
 class Eluna_PlayerScript : public PlayerScript
 {
 public:
-    Eluna_PlayerScript() : PlayerScript("Eluna_PlayerScript", {
+    Eluna_PlayerScript() : PlayerScript("Eluna_PlayerScript", {PLAYERHOOK_ON_PLAYER_RESURRECT,
-        PLAYERHOOK_ON_PLAYER_RESURRECT,
                                                                PLAYERHOOK_CAN_PLAYER_USE_CHAT,
                                                                PLAYERHOOK_CAN_PLAYER_USE_PRIVATE_CHAT,
                                                                PLAYERHOOK_CAN_PLAYER_USE_GROUP_CHAT,
@@ -632,8 +611,8 @@ public:
                                                                PLAYERHOOK_ON_CAN_UPDATE_SKILL,
                                                                PLAYERHOOK_ON_BEFORE_UPDATE_SKILL,
                                                                PLAYERHOOK_ON_UPDATE_SKILL,
-        PLAYERHOOK_CAN_RESURRECT
+                                                               PLAYERHOOK_CAN_RESURRECT,
-    }) { }
+                                                               PLAYERHOOK_ON_BEFORE_TELEPORT}) {}
 
     void OnPlayerResurrect(Player *player, float /*restore_percent*/, bool & /*applySickness*/) override
     {
@@ -949,15 +928,18 @@ public:
     {
         return sEluna->CanPlayerResurrect(player);
     }
+
+    bool OnPlayerBeforeTeleport(Player *player, uint32 mapid, float x, float y, float z, float orientation, uint32 options, Unit *target) override
+    {
+        return sEluna->OnPlayerBeforeTeleport(player, mapid, x, y, z, orientation, options, target);
+    }
 };
 
 class Eluna_ServerScript : public ServerScript
 {
 public:
-    Eluna_ServerScript() : ServerScript("Eluna_ServerScript", {
+    Eluna_ServerScript() : ServerScript("Eluna_ServerScript", {SERVERHOOK_CAN_PACKET_SEND,
-        SERVERHOOK_CAN_PACKET_SEND,
+                                                               SERVERHOOK_CAN_PACKET_RECEIVE}) {}
-        SERVERHOOK_CAN_PACKET_RECEIVE
-    }) { }
 
     bool CanPacketSend(WorldSession *session, WorldPacket const &packet) override
     {
@@ -979,14 +961,12 @@ public:
 class Eluna_SpellSC : public SpellSC
 {
 public:
-    Eluna_SpellSC() : SpellSC("Eluna_SpellSC", {
+    Eluna_SpellSC() : SpellSC("Eluna_SpellSC", {ALLSPELLHOOK_ON_DUMMY_EFFECT_GAMEOBJECT,
-        ALLSPELLHOOK_ON_DUMMY_EFFECT_GAMEOBJECT,
                                                 ALLSPELLHOOK_ON_DUMMY_EFFECT_CREATURE,
                                                 ALLSPELLHOOK_ON_DUMMY_EFFECT_ITEM,
                                                 ALLSPELLHOOK_ON_CAST_CANCEL,
                                                 ALLSPELLHOOK_ON_CAST,
-        ALLSPELLHOOK_ON_PREPARE
+                                                ALLSPELLHOOK_ON_PREPARE}) {}
-    }) { }
 
     void OnDummyEffect(WorldObject *caster, uint32 spellID, SpellEffIndex effIndex, GameObject *gameObjTarget) override
     {
@@ -1053,12 +1033,10 @@ public:
 class Eluna_WorldObjectScript : public WorldObjectScript
 {
 public:
-    Eluna_WorldObjectScript() : WorldObjectScript("Eluna_WorldObjectScript", {
+    Eluna_WorldObjectScript() : WorldObjectScript("Eluna_WorldObjectScript", {WORLDOBJECTHOOK_ON_WORLD_OBJECT_DESTROY,
-        WORLDOBJECTHOOK_ON_WORLD_OBJECT_DESTROY,
                                                                               WORLDOBJECTHOOK_ON_WORLD_OBJECT_CREATE,
                                                                               WORLDOBJECTHOOK_ON_WORLD_OBJECT_SET_MAP,
-        WORLDOBJECTHOOK_ON_WORLD_OBJECT_UPDATE
+                                                                              WORLDOBJECTHOOK_ON_WORLD_OBJECT_UPDATE}) {}
-    }) { }
 
     void OnWorldObjectDestroy(WorldObject *object) override
     {
@@ -1085,8 +1063,7 @@ public:
 class Eluna_WorldScript : public WorldScript
 {
 public:
-    Eluna_WorldScript() : WorldScript("Eluna_WorldScript", {
+    Eluna_WorldScript() : WorldScript("Eluna_WorldScript", {WORLDHOOK_ON_OPEN_STATE_CHANGE,
-        WORLDHOOK_ON_OPEN_STATE_CHANGE,
                                                             WORLDHOOK_ON_BEFORE_CONFIG_LOAD,
                                                             WORLDHOOK_ON_AFTER_CONFIG_LOAD,
                                                             WORLDHOOK_ON_SHUTDOWN_INITIATE,
@@ -1095,8 +1072,7 @@ public:
                                                             WORLDHOOK_ON_STARTUP,
                                                             WORLDHOOK_ON_SHUTDOWN,
                                                             WORLDHOOK_ON_AFTER_UNLOAD_ALL_MAPS,
-        WORLDHOOK_ON_BEFORE_WORLD_INITIALIZED
+                                                            WORLDHOOK_ON_BEFORE_WORLD_INITIALIZED}) {}
-    }) { }
 
     void OnOpenStateChange(bool open) override
     {
@@ -1163,12 +1139,10 @@ public:
 class Eluna_TicketScript : public TicketScript
 {
 public:
-    Eluna_TicketScript() : TicketScript("Eluna_TicketScript", {
+    Eluna_TicketScript() : TicketScript("Eluna_TicketScript", {TICKETHOOK_ON_TICKET_CREATE,
-        TICKETHOOK_ON_TICKET_CREATE,
                                                                TICKETHOOK_ON_TICKET_UPDATE_LAST_CHANGE,
                                                                TICKETHOOK_ON_TICKET_CLOSE,
-        TICKETHOOK_ON_TICKET_RESOLVE
+                                                               TICKETHOOK_ON_TICKET_RESOLVE}) {}
-    }) { }
 
     void OnTicketCreate(GmTicket *ticket) override
     {

modules/mod-eluna/src/LuaEngine/Hooks.h

@@ -233,6 +233,7 @@ namespace Hooks
         PLAYER_EVENT_ON_AURA_APPLY                  =     64,       // (event, player, aura)
         PLAYER_EVENT_ON_HEAL                        =     65,       // (event, player, target, gain) - Can return new heal amount
         PLAYER_EVENT_ON_DAMAGE                      =     66,       // (event, player, target, damage) - Can return new damage amount
+        PLAYER_EVENT_ON_BEFORE_TELEPORT             =     67,       // (event, player, mapid, x, y, z, orientation, options, target)
 
         PLAYER_EVENT_COUNT
     };

modules/mod-eluna/src/LuaEngine/LuaEngine.h

@@ -497,6 +497,7 @@ public:
     void OnPlayerAuraApply(Player* player, Aura* aura);
     void OnPlayerHeal(Player* player, Unit* target, uint32& gain);
     void OnPlayerDamage(Player* player, Unit* target, uint32& gain);
+    bool OnPlayerBeforeTeleport(Player* player, uint32 mapid, float x, float y, float z, float orientation, uint32 options, Unit* target);
 
     /* Vehicle */
     void OnInstall(Vehicle* vehicle);

modules/mod-eluna/src/LuaEngine/hooks/PlayerHooks.cpp

@@ -826,3 +826,19 @@ void Eluna::OnPlayerDamage(Player* player, Unit* target, uint32& damage)
 
     CleanUpStack(3);
 }
+
+bool Eluna::OnPlayerBeforeTeleport(Player* player, uint32 mapid, float x, float y, float z, float orientation, uint32 options, Unit* target)
+{
+    START_HOOK_WITH_RETVAL(PLAYER_EVENT_ON_BEFORE_TELEPORT, true);
+
+    Push(player);
+    Push(mapid);
+    Push(x);
+    Push(y);
+    Push(z);
+    Push(orientation);
+    Push(options);
+    Push(target);
+
+    return CallAllFunctionsBool(PlayerEventBindings, key, true);
+}

modules/mod-eluna/src/LuaEngine/methods/GlobalMethods.h

@@ -785,6 +785,7 @@ namespace LuaGlobalFunctions
      *     PLAYER_EVENT_ON_AURA_APPLY              =     64,       // (event, player, aura)
      *     PLAYER_EVENT_ON_HEAL                    =     65,       // (event, player, target, heal) - Can return new heal amount
      *     PLAYER_EVENT_ON_DAMAGE                  =     66,       // (event, player, target, damage) - Can return new damage amount
+     *     PLAYER_EVENT_ON_BEFORE_TELEPORT         =     67,       // (event, player, target, damage) - Can return new damage amount
      * };
      * </pre>
      *

sql/Premium/world.sql

@@ -52,8 +52,6 @@ INSERT
 	RacialLeader,
 	movementId,
 	RegenHealth,
-	mechanic_immune_mask,
-	spell_school_immune_mask,
 	flags_extra,
 	ScriptName,
 	VerifiedBuild)
@@ -72,7 +70,7 @@ VALUES
 81,
 2,
 21,
-1,
+69,341,185,
 1.0,
 1.42857,
 1.0,
@@ -99,7 +97,7 @@ VALUES
 0,
 1163,
 1524,
-'SmartAI',
+'PassiveAI',
 0,
 1.0,
 4.0,
@@ -109,8 +107,6 @@ VALUES
 0,
 144,
 1,
-1007366674,
-0,
 0,
 '',
 12340) ON DUPLICATE KEY UPDATE entry = entry;

src/server/game/Handlers/AuctionHouseHandler.cpp

@@ -278,15 +278,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
             AH->houseId = AuctionHouseId::Neutral;
         else
         {
-            CreatureData const* auctioneerData = sObjectMgr->GetCreatureData(creature->GetSpawnId());
+            CreatureTemplate const *auctioneerInfo = creature->GetCreatureTemplate();
-            if (!auctioneerData)
-            {
-                LOG_ERROR("network.opcode", "Data for auctioneer not found ({})", auctioneer.ToString());
-                delete AH;
-                return;
-            }
-
-            CreatureTemplate const* auctioneerInfo = sObjectMgr->GetCreatureTemplate(auctioneerData->id);
             if (!auctioneerInfo)
             {
                 LOG_ERROR("network.opcode", "Non existing auctioneer ({})", auctioneer.ToString());