From 12b3ee48d5633e41b9bd4b4e2f6a5039d4e1508d Mon Sep 17 00:00:00 2001 From: Ludwig Date: Sun, 2 Mar 2025 14:10:30 +0100 Subject: [PATCH] fix codestyle and add enabled hook lists for performance improvement --- src/instance_reset.cpp | 12 ------------ src/instance_reset.h | 18 +++++++++++------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/instance_reset.cpp b/src/instance_reset.cpp index d40babe..80a82d8 100644 --- a/src/instance_reset.cpp +++ b/src/instance_reset.cpp @@ -111,39 +111,27 @@ bool InstanceReset::OnGossipHello(Player* player, Creature* creature) case 1: { if (player->HasItemCount(token, count, true)) - { AddGossipItemFor(player, GOSSIP_ICON_CHAT, gossipText, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - } else - { creature->Whisper("You do not have the required items or token.", LANG_UNIVERSAL, player); - } break; } case 2: { if (player->GetMoney() >= money) - { AddGossipItemFor(player, GOSSIP_ICON_CHAT, gossipText, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - } else - { creature->Whisper("You don't have enough money.", LANG_UNIVERSAL, player); - } break; } case 3: { if ((player->HasItemCount(token, count, true)) && ((player->GetMoney() >= money))) - { AddGossipItemFor(player, GOSSIP_ICON_CHAT, gossipText, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - } else - { creature->Whisper("The reset requires a token and money.", LANG_UNIVERSAL, player); - } break; } diff --git a/src/instance_reset.h b/src/instance_reset.h index 10ab5cb..b8e6026 100644 --- a/src/instance_reset.h +++ b/src/instance_reset.h @@ -1,13 +1,13 @@ -#include "ScriptMgr.h" -#include "Player.h" +#include "Chat.h" #include "Configuration/Config.h" #include "GossipDef.h" -#include "ScriptedGossip.h" #include "Language.h" -#include "Chat.h" +#include "Opcodes.h" +#include "Player.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Opcodes.h" void GossipSetText(Player* player, std::string message, uint32 textID); @@ -20,7 +20,9 @@ uint32 money = 10000000; class InstanceResetAnnouncer : public PlayerScript { public: - InstanceResetAnnouncer() : PlayerScript("InstanceResetAnnouncer") {} + InstanceResetAnnouncer() : PlayerScript("InstanceResetAnnouncer", { + PLAYERHOOK_ON_LOGIN + }) {} void OnPlayerLogin(Player* player) override; }; @@ -37,7 +39,9 @@ class InstanceReset : public CreatureScript class InstanceResetWorldConfig : public WorldScript { public: - InstanceResetWorldConfig() : WorldScript("InstanceResetWorldConfig") { } + InstanceResetWorldConfig() : WorldScript("InstanceResetWorldConfig", { + WORLDHOOK_ON_BEFORE_CONFIG_LOAD + }) { } void OnBeforeConfigLoad(bool /*reload*/) override; };