diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index b4d37fa41..8be4f1000 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1298,6 +1298,7 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_WINTERGRASP_RESTART_AFTER_CRASH] = sConfigMgr->GetIntDefault("Wintergrasp.CrashRestartTimer", 10); m_int_configs[CONFIG_BIRTHDAY_TIME] = sConfigMgr->GetIntDefault("BirthdayTime", 1222964635); + m_bool_configs[CONFIG_MINIGOB_MANABONK] = sConfigMgr->GetBoolDefault("Minigob.Manabonk.Enable", true); // call ScriptMgr if we're reloading the configuration sScriptMgr->OnAfterConfigLoad(reload); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 089f1fa64..d302ec89b 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -324,6 +324,7 @@ enum WorldIntConfigs CONFIG_WARDEN_NUM_MEM_CHECKS, CONFIG_WARDEN_NUM_OTHER_CHECKS, CONFIG_BIRTHDAY_TIME, + CONFIG_MINIGOB_MANABONK, INT_CONFIG_VALUE_COUNT }; diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index e6998f3f3..711ce8e19 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -18,6 +18,7 @@ Script Data End */ #include "Player.h" #include "WorldSession.h" #include "ScriptedEscortAI.h" +#include "World.h" // Ours class npc_steam_powered_auctioneer : public CreatureScript @@ -558,6 +559,10 @@ class npc_minigob_manabonk : public CreatureScript void UpdateAI(uint32 diff) { + + if (CONFIG_MINIGOB_MANABONK == false) + return; + events.Update(diff); while (uint32 eventId = events.ExecuteEvent()) diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index ca089cd6d..a991a9c44 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -28,6 +28,7 @@ #include "CombatAI.h" #include "Player.h" #include "PoolMgr.h" +#include "World.h" #define GOSSIP_HELLO_DEMO1 "Build catapult." #define GOSSIP_HELLO_DEMO2 "Build demolisher." @@ -274,6 +275,9 @@ class npc_wg_queue : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) { + if (CONFIG_WINTERGRASP_ENABLE == false) + return false; + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -336,6 +340,9 @@ class npc_wg_queue : public CreatureScript void UpdateAI(uint32 diff) { + if (CONFIG_WINTERGRASP_ENABLE == false) + return; + ScriptedAI::UpdateAI(diff); events.Update(diff); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index f22a09199..7c14d0df4 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -3122,5 +3122,13 @@ DontCacheRandomMovementPaths = 0 MoveMaps.Enable = 1 +# +# Minigob.Manabonk.Enable +# Description: Enable/ Disable Minigob Manabonk +# Default: 1 + +Minigob.Manabonk.Enable = 1 + + # ###################################################################################################