sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-10-30 21:43:42 +08:00
parent 2e37c1ff1d 752c6875b5
commit abd9b4ebb8
128 changed files with 5812 additions and 1264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/GuardAI.cpp
-1
View File
@@ -16,7 +16,6 @@
*/
#include "GuardAI.h"
#include "CreatureAIImpl.h"
#include "Player.h"
int32 GuardAI::Permissible(Creature const* creature)
src/server/game/AI/CreatureAIImpl.h
-2
View File
@@ -18,9 +18,7 @@
#ifndef CREATUREAIIMPL_H
#define CREATUREAIIMPL_H
#include "CreatureAI.h"
#include "Define.h"
#include "SpellMgr.h"
#include "TemporarySummon.h"
template<typename First, typename Second, typename... Rest>
src/server/game/AI/SmartScripts/SmartScript.cpp
+22 -6
View File
@@ -145,7 +145,16 @@ void SmartScript::ProcessEventsFor(SMART_EVENT e, Unit* unit, uint32 var0, uint3
ConditionSourceInfo info = ConditionSourceInfo(unit, GetBaseObject(), me ? me->GetVictim() : nullptr);
if (sConditionMgr->IsObjectMeetToConditions(info, conds))
ProcessEvent(*i, unit, var0, var1, bvar, spell, gob);
{
ASSERT(executionStack.empty());
executionStack.emplace_back(SmartScriptFrame{ *i, unit, var0, var1, bvar, spell, gob });
while (!executionStack.empty())
{
auto [stack_holder , stack_unit, stack_var0, stack_var1, stack_bvar, stack_spell, stack_gob] = executionStack.back();
executionStack.pop_back();
ProcessEvent(stack_holder, stack_unit, stack_var0, stack_var1, stack_bvar, stack_spell, stack_gob);
}
}
}
}
}
@@ -684,7 +693,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
bool isSpellIgnoreLOS = spellInfo->HasAttribute(SPELL_ATTR2_IGNORE_LINE_OF_SIGHT);
// If target is rooted we move out of melee range before casting, but not further than spell max range.
if (isWithinLOSInMap && isWithinMeleeRange && isRangedAttack && isTargetRooted && canCastSpell)
if (isWithinLOSInMap && isWithinMeleeRange && isRangedAttack && isTargetRooted && canCastSpell && !me->IsVehicle())
{
failedSpellCast = true; // Mark spellcast as failed so we can retry it later
float minDistance = std::max(meleeRange, spellMinRange) - distanceToTarget + NOMINAL_MELEE_RANGE;
@@ -3255,9 +3264,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (e.link && e.link != e.event_id)
{
SmartScriptHolder linked = FindLinkedEvent(e.link);
if (linked.GetActionType() && linked.GetEventType() == SMART_EVENT_LINK)
ProcessEvent(linked, unit, var0, var1, bvar, spell, gob);
auto linked = FindLinkedEvent(e.link);
if (linked.has_value() && linked.value().get().GetEventType() == SMART_EVENT_LINK)
executionStack.emplace_back(SmartScriptFrame{ linked.value(), unit, var0, var1, bvar, spell, gob });
else
LOG_ERROR("sql.sql", "SmartScript::ProcessAction: Entry {} SourceType {}, Event {}, Link Event {} not found or invalid, skipped.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.link);
}
@@ -4852,7 +4861,14 @@ void SmartScript::UpdateTimer(SmartScriptHolder& e, uint32 const diff)
case SMART_EVENT_DISTANCE_CREATURE:
case SMART_EVENT_DISTANCE_GAMEOBJECT:
{
ProcessEvent(e);
ASSERT(executionStack.empty());
executionStack.emplace_back(SmartScriptFrame{ e, nullptr, 0, 0, false, nullptr, nullptr });
while (!executionStack.empty())
{
auto [stack_holder, stack_unit, stack_var0, stack_var1, stack_bvar, stack_spell, stack_gob] = executionStack.back();
executionStack.pop_back();
ProcessEvent(stack_holder, stack_unit, stack_var0, stack_var1, stack_bvar, stack_spell, stack_gob);
}
if (e.GetScriptType() == SMART_SCRIPT_TYPE_TIMED_ACTIONLIST)
{
e.enableTimed = false;//disable event if it is in an ActionList and was processed once
src/server/game/AI/SmartScripts/SmartScript.h
+18 -4
View File
@@ -25,9 +25,21 @@
#include "SmartScriptMgr.h"
#include "Spell.h"
#include "Unit.h"
#include <deque>
class SmartScript
{
struct SmartScriptFrame
{
SmartScriptHolder& holder;
Unit* unit;
uint32 var0;
uint32 var1;
bool bvar;
SpellInfo const* spell;
GameObject* gob;
};
public:
SmartScript();
~SmartScript();
@@ -253,7 +265,8 @@ private:
}
}
}
SmartScriptHolder FindLinkedEvent (uint32 link)
std::optional<std::reference_wrapper<
SmartScriptHolder>> FindLinkedEvent(uint32 link)
{
if (!mEvents.empty())
{
@@ -261,15 +274,16 @@ private:
{
if (i->event_id == link)
{
return (*i);
return std::ref(*i);
}
}
}
SmartScriptHolder s;
return s;
return std::nullopt;
}
GuidUnorderedSet _summonList;
std::deque<SmartScriptFrame> executionStack;
};
#endif
src/server/game/Achievements/AchievementMgr.h
-1
View File
@@ -23,7 +23,6 @@
#include "DBCStores.h"
#include "DatabaseEnv.h"
#include "ObjectGuid.h"
#include <chrono>
#include <map>
#include <string>
src/server/game/Addons/AddonMgr.cpp
+1
View File
@@ -20,6 +20,7 @@
#include "DatabaseEnv.h"
#include "Log.h"
#include "Timer.h"
#include "QueryResult.h"
#include <list>
namespace AddonMgr
src/server/game/Addons/AddonMgr.h
-1
View File
@@ -22,7 +22,6 @@
#include <array>
#include <list>
#include <string>
#include <utility>
struct AddonInfo
{
src/server/game/ArenaSpectator/ArenaSpectator.cpp
-1
View File
@@ -23,7 +23,6 @@
#include "Player.h"
#include "SpellAuraEffects.h"
#include "SpellAuras.h"
#include "Types.h"
#include "World.h"
bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, std::string const& name)
src/server/game/Battlegrounds/BattlegroundQueue.h
-1
View File
@@ -23,7 +23,6 @@
#include "DBCEnums.h"
#include "EventProcessor.h"
#include <array>
#include <deque>
constexpr auto COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME = 10;
src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
+26
View File
@@ -1328,6 +1328,27 @@ bool BattlegroundAV::SetupBattleground()
return false;
}
// Hallow's End decorations
if (IsHolidayActive(HOLIDAY_HALLOWS_END))
for (uint16 i = 0; i <= (BG_AV_OBJECT_HALLOWS_END_MAX - BG_AV_OBJECT_HALLOWS_END_MIN); i++)
{
if (!AddObject(BG_AV_OBJECT_HALLOWS_END_MIN + i,
std::get<0>(BG_AV_HallowsEndObjectPos[i]),
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetPositionX(),
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetPositionY(),
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetPositionZ(),
std::get<1>(BG_AV_HallowsEndObjectPos[i]).GetOrientation(),
std::get<2>(BG_AV_HallowsEndObjectPos[i])[0],
std::get<2>(BG_AV_HallowsEndObjectPos[i])[1],
std::get<2>(BG_AV_HallowsEndObjectPos[i])[2],
std::get<2>(BG_AV_HallowsEndObjectPos[i])[3],
RESPAWN_ONE_DAY))
{
LOG_ERROR("bg.battleground", "BatteGroundAV: Failed to spawn some object Battleground not created!11.{}", i);
return false;
}
}
// Generic gameobjects
for (uint16 i = 0; i <= (BG_AV_OBJECT_GENERIC_MAX - BG_AV_OBJECT_GENERIC_MIN); i++)
{
@@ -1403,6 +1424,11 @@ bool BattlegroundAV::SetupBattleground()
for (i = BG_AV_OBJECT_HANDPACKED_SNOWDRIFT_MIN ; i <= BG_AV_OBJECT_HANDPACKED_SNOWDRIFT_MAX; i++)
SpawnBGObject(i, RESPAWN_IMMEDIATELY);
// Hallow's End decorations
if (IsHolidayActive(HOLIDAY_HALLOWS_END))
for (uint16 i = BG_AV_OBJECT_HALLOWS_END_MIN; i <= BG_AV_OBJECT_HALLOWS_END_MAX; i++)
SpawnBGObject(i, RESPAWN_IMMEDIATELY);
// Generic gameobjects
for (uint16 i = BG_AV_OBJECT_GENERIC_MIN; i <= BG_AV_OBJECT_GENERIC_MAX; i++)
SpawnBGObject(i, RESPAWN_IMMEDIATELY);
src/server/game/Battlegrounds/Zones/BattlegroundAV.h
+93 -1
View File
@@ -326,8 +326,10 @@ enum BG_AV_ObjectTypes
BG_AV_OBJECT_STORMPIKE_BANNER = 248,
BG_AV_OBJECT_GENERIC_MIN = 249,
BG_AV_OBJECT_GENERIC_MAX = 323,
BG_AV_OBJECT_HALLOWS_END_MIN = 324,
BG_AV_OBJECT_HALLOWS_END_MAX = 403,
BG_AV_OBJECT_MAX = 324
BG_AV_OBJECT_MAX = 404
};
enum BG_AV_OBJECTS
@@ -658,6 +660,96 @@ std::tuple<uint32, Position, std::array<float, 4>> const BG_AV_GenericObjectPos[
{ 179438, { -1181.10f, -370.747f, 53.6246f, 2.68781f }, { 0.0f, 0.0f, 0.974370f, 0.224951f } }, // 46248
};
// GO template ID, Position, rotation0-3, VerifiedBuild
std::tuple<uint32, Position, std::array<float, 4>> const BG_AV_HallowsEndObjectPos[BG_AV_OBJECT_HALLOWS_END_MAX - BG_AV_OBJECT_HALLOWS_END_MIN + 1] =
{
// G_Pumpkin_01
{ 180405, { -1158.97f, -357.826f, 52.0172f, 2.02458f }, { 0.0f, 0.0f, 0.848047f, 0.529921f } }, // 46248
{ 180405, { -126.302f, -453.835f, 36.749f, 1.97222f }, { 0.0f, 0.0f, 0.833885f, 0.551938f } }, // 46248
{ 180405, { -1305.91f, -299.92f, 92.6384f, 3.85718f }, { 0.0f, 0.0f, -0.936671f, 0.35021f } }, // 46248
{ 180405, { -1357.74f, -283.203f, 95.7139f, 1.309f }, { 0.0f, 0.0f, 0.608761f, 0.793354f } }, // 46248
{ 180405, { -500.524f, -192.561f, 57.4784f, 2.02458f }, { 0.0f, 0.0f, 0.848047f, 0.529921f } }, // 46248
{ 180405, { -766.615f, -343.542f, 67.8594f, 2.32129f }, { 0.0f, 0.0f, 0.91706f, 0.39875f } }, // 46248
{ 180405, { 14.5434f, -288.689f, 18.6031f, 1.309f }, { 0.0f, 0.0f, 0.608761f, 0.793354f } }, // 46248
{ 180405, { 15.1771f, -417.266f, 45.4566f, 4.64258f }, { 0.0f, 0.0f, -0.731354f, 0.681998f } }, // 46248
{ 180405, { 233.097f, -339.278f, 45.7862f, 1.18682f }, { 0.0f, 0.0f, 0.559193f, 0.829038f } }, // 46248
{ 180405, { 587.37f, -82.283f, 48.2967f, 2.32129f }, { 0.0f, 0.0f, 0.91706f, 0.39875f } }, // 46248
{ 180405, { 607.686f, -18.3559f, 49.127f, 0.837757f }, { 0.0f, 0.0f, 0.406736f, 0.913546f } }, // 46248
{ 180405, { 615.03f, -192.127f, 41.8927f, 0.59341f }, { 0.0f, 0.0f, 0.292371f, 0.956305f } }, // 46248
{ 180405, { 629.882f, -153.54f, 42.6296f, 0.558504f }, { 0.0f, 0.0f, 0.275637f, 0.961262f } }, // 46248
{ 180405, { 644.681f, -121.622f, 53.0553f, 3.50812f }, { 0.0f, 0.0f, -0.983254f, 0.182238f } }, // 46248
{ 180405, { 646.655f, -265.535f, 39.2146f, 0.279252f }, { 0.0f, 0.0f, 0.139173f, 0.990268f } }, // 46248
{ 180405, { 666.656f, -16.0868f, 53.9853f, 5.81195f }, { 0.0f, 0.0f, -0.233445f, 0.97237f } }, // 46248
// G_Pumpkin_02
{ 180406, { -115.708f, -559.182f, 46.4159f, 3.3685f }, { 0.0f, 0.0f, -0.993571f, 0.113208f } }, // 46248
{ 180406, { -1208.5f, -248.34f, 73.0666f, 1.6057f }, { 0.0f, 0.0f, 0.719339f, 0.694659f } }, // 46248
{ 180406, { -1227.88f, -372.741f, 57.9504f, 2.51327f }, { 0.0f, 0.0f, 0.951056f, 0.309017f } }, // 46248
{ 180406, { -1315.84f, -266.819f, 91.5945f, 6.14356f }, { 0.0f, 0.0f, -0.0697556f, 0.997564f } }, // 46248
{ 180406, { -132.559f, -469.016f, 36.7525f, 1.53589f }, { 0.0f, 0.0f, 0.694658f, 0.71934f } }, // 46248
{ 180406, { -1343.9f, -278.906f, 95.8878f, 0.157079f }, { 0.0f, 0.0f, 0.0784588f, 0.996917f } }, // 46248
{ 180406, { -1359.55f, -275.984f, 97.4804f, 1.25664f }, { 0.0f, 0.0f, 0.587785f, 0.809017f } }, // 46248
{ 180406, { -494.535f, -177.293f, 57.4655f, 0.820303f }, { 0.0f, 0.0f, 0.398748f, 0.91706f } }, // 46248
{ 180406, { -563.554f, -277.615f, 51.8459f, 1.25664f }, { 0.0f, 0.0f, 0.587785f, 0.809017f } }, // 46248
{ 180406, { 11.2743f, -309.234f, 18.5687f, 2.02458f }, { 0.0f, 0.0f, 0.848047f, 0.529921f } }, // 46248
{ 180406, { 226.415f, -343.573f, 52.7243f, 2.65289f }, { 0.0f, 0.0f, 0.970295f, 0.241925f } }, // 46248
{ 180406, { 4.625f, -287.089f, 18.9285f, 1.53589f }, { 0.0f, 0.0f, 0.694658f, 0.71934f } }, // 46248
{ 180406, { 580.425f, -67.8611f, 48.2671f, 1.79769f }, { 0.0f, 0.0f, 0.782608f, 0.622515f } }, // 46248
{ 180406, { 602.411f, -20.1337f, 49.127f, 0.523598f }, { 0.0f, 0.0f, 0.258819f, 0.965926f } }, // 46248
{ 180406, { 609.092f, -156.634f, 42.63f, 0.523598f }, { 0.0f, 0.0f, 0.258819f, 0.965926f } }, // 46248
{ 180406, { 626.033f, -268.701f, 39.2121f, 0.471238f }, { 0.0f, 0.0f, 0.233445f, 0.97237f } }, // 46248
{ 180406, { 640.854f, -230.306f, 40.6572f, 0.349065f }, { 0.0f, 0.0f, 0.173648f, 0.984808f } }, // 46248
{ 180406, { 657.406f, -19.0451f, 53.6367f, 5.70723f }, { 0.0f, 0.0f, -0.284015f, 0.95882f } }, // 46248
{ 180406, { 659.373f, -113.127f, 59.9997f, 4.85202f }, { 0.0f, 0.0f, -0.656058f, 0.75471f } }, // 46248
{ 180406, { 672.715f, -36.0156f, 53.9853f, 5.00909f }, { 0.0f, 0.0f, -0.594823f, 0.803857f } }, // 46248
// G_Pumpkin_03
{ 180407, { -1160.13f, -348.217f, 52.0004f, 1.8675f }, { 0.0f, 0.0f, 0.803857f, 0.594823f } }, // 46248
{ 180407, { -119.587f, -457.271f, 29.7838f, 1.71042f }, { 0.0f, 0.0f, 0.754709f, 0.656059f } }, // 46248
{ 180407, { -1209.86f, -258.707f, 72.7768f, 1.8675f }, { 0.0f, 0.0f, 0.803857f, 0.594823f } }, // 46248
{ 180407, { -1346.58f, -271.594f, 97.4922f, 0.209439f }, { 0.0f, 0.0f, 0.104528f, 0.994522f } }, // 46248
{ 180407, { -1362.37f, -309.545f, 91.7044f, 2.46091f }, { 0.0f, 0.0f, 0.942641f, 0.333808f } }, // 46248
{ 180407, { -556.349f, -269.62f, 52.3396f, 0.90757f }, { 0.0f, 0.0f, 0.438371f, 0.898794f } }, // 46248
{ 180407, { -756.531f, -349.429f, 67.5058f, 3.47321f }, { 0.0f, 0.0f, -0.986285f, 0.16505f } }, // 46248
{ 180407, { 1.51215f, -307.455f, 18.9285f, 2.14675f }, { 0.0f, 0.0f, 0.878817f, 0.47716f } }, // 46248
{ 180407, { 236.859f, -356.431f, 52.7499f, 2.26893f }, { 0.0f, 0.0f, 0.906307f, 0.422619f } }, // 46248
{ 180407, { 587.264f, -64.75f, 41.3224f, 1.71042f }, { 0.0f, 0.0f, 0.754709f, 0.656059f } }, // 46248
{ 180407, { 621.241f, -233.352f, 40.6083f, 0.663223f }, { 0.0f, 0.0f, 0.325567f, 0.945519f } }, // 46248
{ 180407, { 634.472f, -189.106f, 41.8665f, 0.523598f }, { 0.0f, 0.0f, 0.258819f, 0.965926f } }, // 46248
{ 180407, { 650.7f, -126.259f, 59.9983f, 3.94445f }, { 0.0f, 0.0f, -0.920505f, 0.390732f } }, // 46248
{ 180407, { 663.257f, -38.8993f, 53.6307f, 4.92183f }, { 0.0f, 0.0f, -0.62932f, 0.777146f } }, // 46248
// Bat01
{ 180426, { -1329.83f, -300.214f, 107.965f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
{ 180426, { -1332.54f, -294.962f, 117.904f, 1.51844f }, { 0.0f, 0.0f, 0.688354f, 0.725374f } }, // 46248
{ 180426, { -1336.12f, -293.71f, 109.14f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
{ 180426, { -1338.41f, -299.877f, 111.3f, 0.767944f }, { 0.0f, 0.0f, 0.374606f, 0.927184f } }, // 46248
{ 180426, { -247.924f, -289.095f, 43.7022f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
{ 180426, { -250.307f, -294.67f, 51.5083f, 1.51844f }, { 0.0f, 0.0f, 0.688354f, 0.725374f } }, // 46248
{ 180426, { -255.208f, -305.076f, 47.9254f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
{ 180426, { -263.672f, -294.012f, 66.9219f, 3.4383f }, { 0.0f, 0.0f, -0.989016f, 0.147811f } }, // 46248
{ 180426, { -268.958f, -286.128f, 65.7266f, 5.28835f }, { 0.0f, 0.0f, -0.477159f, 0.878817f } }, // 46248
{ 180426, { -269.526f, -278.163f, 65.567f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
{ 180426, { -270.384f, -292.399f, 57.8192f, 5.14872f }, { 0.0f, 0.0f, -0.537299f, 0.843392f } }, // 46248
{ 180426, { 617.543f, -72.4375f, 61.5847f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
{ 180426, { 622.451f, -62.4271f, 70.3966f, 2.70526f }, { 0.0f, 0.0f, 0.976295f, 0.216442f } }, // 46248
{ 180426, { 627.418f, -47.6285f, 58.8142f, 0.890117f }, { 0.0f, 0.0f, 0.430511f, 0.902586f } }, // 46248
{ 180426, { 630.523f, -44.9826f, 69.864f, 3.24635f }, { 0.0f, 0.0f, -0.998629f, 0.0523532f } }, // 46248
{ 180426, { 632.502f, -67.3333f, 65.444f, 3.14159f }, { 0.0f, 0.0f, -1.0f, 0.0f } }, // 46248
{ 180426, { 635.186f, -45.3333f, 55.8426f, 2.09439f }, { 0.0f, 0.0f, 0.866025f, 0.500001f } }, // 46248
// Bat02
{ 180427, { -1336.3f, -295.644f, 116.531f, 3.45576f }, { 0.0f, 0.0f, -0.987688f, 0.156436f } }, // 46248
{ 180427, { -1338.58f, -296.351f, 117.126f, 4.13643f }, { 0.0f, 0.0f, -0.878817f, 0.47716f } }, // 46248
{ 180427, { -1341.88f, -298.439f, 119.023f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
{ 180427, { -1347.11f, -291.332f, 110.968f, 3.45576f }, { 0.0f, 0.0f, -0.987688f, 0.156436f } }, // 46248
{ 180427, { -258.149f, -300.316f, 52.5291f, 2.80998f }, { 0.0f, 0.0f, 0.986285f, 0.16505f } }, // 46248
{ 180427, { -263.734f, -304.363f, 41.6929f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
{ 180427, { -265.972f, -290.925f, 73.3895f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
{ 180427, { -267.002f, -291.997f, 68.8963f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
{ 180427, { -273.811f, -288.575f, 50.9076f, 4.97419f }, { 0.0f, 0.0f, -0.608761f, 0.793354f } }, // 46248
{ 180427, { 618.34f, -55.8924f, 73.4326f, 2.70526f }, { 0.0f, 0.0f, 0.976295f, 0.216442f } }, // 46248
{ 180427, { 625.45f, -53.5191f, 60.4743f, 2.74016f }, { 0.0f, 0.0f, 0.979924f, 0.19937f } }, // 46248
{ 180427, { 627.179f, -43.5382f, 72.6337f, 2.65289f }, { 0.0f, 0.0f, 0.970295f, 0.241925f } }, // 46248
{ 180427, { 636.71f, -62.2118f, 69.4788f, 2.19911f }, { 0.0f, 0.0f, 0.891006f, 0.453991f } }, // 46248
};
const float BG_AV_DoorPositons[2][4] =
{
{780.487f, -493.024f, 99.9553f, 3.0976f}, //alliance
src/server/game/Chat/Channels/Channel.h
-3
View File
@@ -21,10 +21,7 @@
#include "Common.h"
#include "WorldPacket.h"
#include "WorldSession.h"
#include <list>
#include <map>
#include <string>
#include <utility>
class Player;
src/server/game/Chat/Channels/ChannelMgr.h
-1
View File
@@ -19,7 +19,6 @@
#define __ACORE_CHANNELMGR_H
#include "Channel.h"
#include "Common.h"
#include "World.h"
#include <map>
#include <string>
src/server/game/Chat/Chat.h
-1
View File
@@ -22,7 +22,6 @@
#include "Player.h"
#include "SharedDefines.h"
#include "WorldSession.h"
#include <vector>
class ChatHandler;
class Creature;
src/server/game/Chat/ChatCommands/ChatCommand.h
-2
View File
@@ -23,14 +23,12 @@
#include "Define.h"
#include "Errors.h"
#include "Language.h"
#include "ObjectGuid.h"
#include "Optional.h"
#include "StringFormat.h"
#include "Util.h"
#include <cstddef>
#include <map>
#include <tuple>
#include <utility>
#include <variant>
#include <vector>
src/server/game/Chat/ChatCommands/ChatCommandArgs.h
-1
View File
@@ -24,7 +24,6 @@
#include "StringConvert.h"
#include "StringFormat.h"
#include "Util.h"
#include <charconv>
#include <map>
#include <string>
#include <string_view>
src/server/game/Combat/HostileRefMgr.h
-1
View File
@@ -18,7 +18,6 @@
#ifndef _HOSTILEREFMANAGER
#define _HOSTILEREFMANAGER
#include "Common.h"
#include "RefMgr.h"
class Unit;
src/server/game/Combat/ThreatMgr.h
-1
View File
@@ -18,7 +18,6 @@
#ifndef _THREATMANAGER
#define _THREATMANAGER
#include "Common.h"
#include "IteratorPair.h"
#include "ObjectGuid.h"
#include "Reference.h"
src/server/game/Conditions/ConditionMgr.h
-1
View File
@@ -19,7 +19,6 @@
#define ACORE_CONDITIONMGR_H
#include "Define.h"
#include "Errors.h"
#include <list>
#include <map>
src/server/game/Conditions/DisableMgr.cpp
+1
View File
@@ -25,6 +25,7 @@
#include "SpellMgr.h"
#include "StringConvert.h"
#include "Tokenize.h"
#include "VMapMgr2.h"
#include "World.h"
namespace DisableMgr
src/server/game/Conditions/DisableMgr.h
-2
View File
@@ -20,8 +20,6 @@
#include "Define.h"
#include "Map.h"
#include "VMapMgr2.h"
class Unit;
enum DisableType
src/server/game/DataStores/M2Stores.cpp
-1
View File
@@ -23,7 +23,6 @@
#include "World.h"
#include <boost/filesystem/path.hpp>
#include <fstream>
#include <iostream>
typedef std::vector<FlyByCamera> FlyByCameraCollection;
std::unordered_map<uint32, FlyByCameraCollection> sFlyByCameraStore;
src/server/game/DungeonFinding/LFG.h
-3
View File
@@ -18,10 +18,7 @@
#ifndef _LFG_H
#define _LFG_H
#include "Common.h"
#include "ObjectDefines.h"
#include "ObjectGuid.h"
#include "SharedDefines.h"
#include "WorldPacket.h"
#include <array>
#include <map>
src/server/game/DungeonFinding/LFGMgr.cpp
-1
View File
@@ -30,7 +30,6 @@
#include "LFGGroupData.h"
#include "LFGPlayerData.h"
#include "LFGQueue.h"
#include "LFGScripts.h"
#include "Language.h"
#include "ObjectMgr.h"
#include "Opcodes.h"
src/server/game/DungeonFinding/LFGPlayerData.h
+1
View File
@@ -19,6 +19,7 @@
#define _LFGPLAYERDATA_H
#include "LFG.h"
#include "SharedDefines.h"
namespace lfg
{
src/server/game/DungeonFinding/LFGQueue.cpp
-1
View File
@@ -23,7 +23,6 @@
#include "InstanceScript.h"
#include "LFGMgr.h"
#include "Log.h"
#include "ObjectDefines.h"
#include "ObjectMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
src/server/game/Entities/Creature/Creature.cpp
-1
View File
@@ -33,7 +33,6 @@
#include "LootMgr.h"
#include "ObjectMgr.h"
#include "Opcodes.h"
#include "OutdoorPvPMgr.h"
#include "Pet.h"
#include "Player.h"
#include "PoolMgr.h"
src/server/game/Entities/Creature/Creature.h
-1
View File
@@ -23,7 +23,6 @@
#include "Common.h"
#include "CreatureData.h"
#include "DatabaseEnv.h"
#include "ItemTemplate.h"
#include "LootMgr.h"
#include "Unit.h"
#include "World.h"
src/server/game/Entities/Creature/CreatureData.h
-1
View File
@@ -23,7 +23,6 @@
#include "ItemTemplate.h"
#include "LootMgr.h"
#include "Unit.h"
#include "World.h"
#include <list>
#define MAX_AGGRO_RESET_TIME 10 // in seconds
src/server/game/Entities/Item/Item.cpp
-1
View File
@@ -17,7 +17,6 @@
#include "Item.h"
#include "Common.h"
#include "ConditionMgr.h"
#include "DatabaseEnv.h"
#include "GameTime.h"
#include "ItemEnchantmentMgr.h"
src/server/game/Entities/Object/Position.h
-1
View File
@@ -20,7 +20,6 @@
#include "Common.h"
#include "G3D/Vector3.h"
#include <cmath>
class ByteBuffer;
src/server/game/Entities/Player/Player.cpp
-2
View File
@@ -11350,8 +11350,6 @@ void Player::LeaveBattleground(Battleground* bg)
if (bg->isArena() && (bg->GetStatus() == STATUS_IN_PROGRESS || bg->GetStatus() == STATUS_WAIT_JOIN))
sScriptMgr->OnBattlegroundDesertion(this, ARENA_DESERTION_TYPE_LEAVE_BG);
bg->RemovePlayerAtLeave(this);
// xinef: reset corpse reclaim time
m_deathExpireTime = GameTime::GetGameTime().count();
src/server/game/Entities/Player/PlayerStorage.cpp
-2
View File
@@ -22,7 +22,6 @@
#include "Battlefield.h"
#include "Battleground.h"
#include "BattlegroundMgr.h"
#include "Channel.h"
#include "CharacterDatabaseCleaner.h"
#include "Chat.h"
#include "Common.h"
@@ -46,7 +45,6 @@
#include "ObjectMgr.h"
#include "Opcodes.h"
#include "OutdoorPvP.h"
#include "OutdoorPvPMgr.h"
#include "Pet.h"
#include "Player.h"
#include "QueryHolder.h"
src/server/game/Entities/Unit/Unit.h
+712 -611
View File
File diff suppressed because it is too large Load Diff
src/server/game/Events/GameEventMgr.cpp
-1
View File
@@ -21,7 +21,6 @@
#include "DisableMgr.h"
#include "GameObjectAI.h"
#include "GameTime.h"
#include "GossipDef.h"
#include "Language.h"
#include "Log.h"
#include "MapMgr.h"
src/server/game/Globals/ObjectMgr.cpp
+2
View File
@@ -54,6 +54,8 @@
#include <boost/algorithm/string.hpp>
#include <numeric>
#include "ItemEnchantmentMgr.h"
ScriptMapMap sSpellScripts;
ScriptMapMap sEventScripts;
ScriptMapMap sWaypointScripts;
src/server/game/Globals/ObjectMgr.h
-1
View File
@@ -20,7 +20,6 @@
#include "Bag.h"
#include "ConditionMgr.h"
#include "Corpse.h"
#include "Creature.h"
#include "DatabaseEnv.h"
#include "GameObject.h"
src/server/game/Grids/GridDefines.h
-1
View File
@@ -21,7 +21,6 @@
#include "Common.h"
#include "MapDefines.h"
#include "NGrid.h"
#include <cmath>
// Forward class definitions
class Corpse;
src/server/game/Groups/Group.cpp
-4
View File
@@ -29,15 +29,11 @@
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "Opcodes.h"
#include "Pet.h"
#include "Player.h"
#include "ScriptMgr.h"
#include "SharedDefines.h"
#include "SocialMgr.h"
#include "SpellAuras.h"
#include "UpdateFieldFlags.h"
#include "Util.h"
#include "Vehicle.h"
#include "World.h"
#include "WorldPacket.h"
#include "WorldSession.h"
src/server/game/Guilds/Guild.h
-2
View File
@@ -22,11 +22,9 @@
#include "ObjectMgr.h"
#include "Optional.h"
#include "Player.h"
#include "World.h"
#include "WorldPacket.h"
#include <set>
#include <unordered_map>
#include <unordered_set>
class Item;
src/server/game/Handlers/ItemHandler.cpp
-1
View File
@@ -25,7 +25,6 @@
#include "ScriptMgr.h"
#include "SpellInfo.h"
#include "SpellMgr.h"
#include "UpdateData.h"
#include "WorldPacket.h"
#include "WorldSession.h"
#include <cmath>
src/server/game/Handlers/MiscHandler.cpp
+2 -1
View File
@@ -45,7 +45,6 @@
#include "ScriptMgr.h"
#include "SocialMgr.h"
#include "Spell.h"
#include "UpdateData.h"
#include "Vehicle.h"
#include "WhoListCacheMgr.h"
#include "World.h"
@@ -53,6 +52,8 @@
#include "WorldSession.h"
#include <zlib.h>
#include "Corpse.h"
void WorldSession::HandleRepopRequestOpcode(WorldPacket& recv_data)
{
LOG_DEBUG("network", "WORLD: Recvd CMSG_REPOP_REQUEST Message");
src/server/game/Loot/LootItemStorage.h
-2
View File
@@ -18,11 +18,9 @@
#ifndef ACORE_LOOTITEMSTORAGE_H
#define ACORE_LOOTITEMSTORAGE_H
#include "Common.h"
#include "Item.h"
#include "LootMgr.h"
#include <list>
#include <map>
struct StoredLootItem
{
src/server/game/Loot/LootMgr.cpp
+1
View File
@@ -19,6 +19,7 @@
#include "Containers.h"
#include "DisableMgr.h"
#include "Group.h"
#include "ItemEnchantmentMgr.h"
#include "Log.h"
#include "ObjectMgr.h"
#include "Player.h"
src/server/game/Loot/LootMgr.h
-1
View File
@@ -20,7 +20,6 @@
#include "ByteBuffer.h"
#include "ConditionMgr.h"
#include "ItemEnchantmentMgr.h"
#include "ObjectGuid.h"
#include "RefMgr.h"
#include "SharedDefines.h"
src/server/game/Mails/Mail.cpp
-1
View File
@@ -27,7 +27,6 @@
#include "ObjectMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
#include "Unit.h"
#include "World.h"
MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery)
src/server/game/Mails/Mail.h
-1
View File
@@ -22,7 +22,6 @@
#include "DatabaseEnvFwd.h"
#include "ObjectGuid.h"
#include <map>
#include <utility>
struct AuctionEntry;
struct CalendarEvent;
src/server/game/Maps/Map.cpp
+2
View File
@@ -26,6 +26,7 @@
#include "GridNotifiers.h"
#include "Group.h"
#include "InstanceScript.h"
#include "IVMapMgr.h"
#include "LFGMgr.h"
#include "MapInstanced.h"
#include "Metric.h"
@@ -39,6 +40,7 @@
#include "Transport.h"
#include "VMapFactory.h"
#include "Vehicle.h"
#include "VMapMgr2.h"
#include "Weather.h"
union u_map_magic
src/server/game/Maps/Map.h
-2
View File
@@ -33,11 +33,9 @@
#include "Position.h"
#include "SharedDefines.h"
#include "TaskScheduler.h"
#include "Timer.h"
#include <bitset>
#include <list>
#include <memory>
#include <mutex>
#include <shared_mutex>
class Unit;
src/server/game/Maps/MapInstanced.cpp
-1
View File
@@ -23,7 +23,6 @@
#include "ObjectMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
#include "VMapFactory.h"
MapInstanced::MapInstanced(uint32 id) : Map(id, 0, DUNGEON_DIFFICULTY_NORMAL)
{
src/server/game/Maps/MapMgr.h
-2
View File
@@ -25,8 +25,6 @@
#include "MapUpdater.h"
#include "Object.h"
#include <mutex>
class Transport;
class StaticTransport;
class MotionTransport;
src/server/game/Maps/MapUpdater.h
-1
View File
@@ -21,7 +21,6 @@
#include "Define.h"
#include "PCQueue.h"
#include <condition_variable>
#include <mutex>
#include <thread>
class Map;
src/server/game/Maps/ZoneScript.h
-1
View File
@@ -18,7 +18,6 @@
#ifndef ZONE_SCRIPT_H_
#define ZONE_SCRIPT_H_
#include "Common.h"
#include "Creature.h"
class GameObject;
src/server/game/Misc/AsyncAuctionListing.h
-2
View File
@@ -20,8 +20,6 @@
#include "AuctionHouseMgr.h"
#include <mutex>
class AuctionListOwnerItemsDelayEvent : public BasicEvent
{
public:
src/server/game/Misc/GameGraveyard.h
-1
View File
@@ -18,7 +18,6 @@
#ifndef _GAMEGRAVEYARD_H_
#define _GAMEGRAVEYARD_H_
#include "Common.h"
#include "Player.h"
#include "SharedDefines.h"
#include <map>
src/server/game/Movement/Waypoints/WaypointMgr.cpp
+1
View File
@@ -19,6 +19,7 @@
#include "DatabaseEnv.h"
#include "GridDefines.h"
#include "Log.h"
#include "QueryResult.h"
WaypointMgr::WaypointMgr()
{
src/server/game/OutdoorPvP/OutdoorPvP.h
-1
View File
@@ -19,7 +19,6 @@
#define OUTDOOR_PVP_H_
#include "SharedDefines.h"
#include "Util.h"
#include "ZoneScript.h"
#include <array>
src/server/game/OutdoorPvP/OutdoorPvPMgr.h
-1
View File
@@ -21,7 +21,6 @@
#define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000
#include "OutdoorPvP.h"
#include <memory>
class Player;
class GameObject;
src/server/game/Petitions/PetitionMgr.h
-1
View File
@@ -18,7 +18,6 @@
#ifndef _PETITIONMGR_H
#define _PETITIONMGR_H
#include "Common.h"
#include "ObjectGuid.h"
#include <map>
src/server/game/Scripting/ScriptMgr.h
-2
View File
@@ -31,10 +31,8 @@
#include "LFGMgr.h"
#include "ObjectMgr.h"
#include "PetDefines.h"
#include "QuestDef.h"
#include "SharedDefines.h"
#include "Tuples.h"
#include "Types.h"
#include "Weather.h"
#include "World.h"
#include <atomic>
src/server/game/Scripting/ScriptObject.h
-1
View File
@@ -20,7 +20,6 @@
#include "DatabaseEnvFwd.h"
#include "ScriptObjectFwd.h"
#include <string_view>
//#include "Duration.h"
//#include "LFG.h"
src/server/game/Server/WorldPacket.h
-1
View File
@@ -19,7 +19,6 @@
#define _WORLDPACKET_H_
#include "ByteBuffer.h"
#include "Common.h"
#include "Duration.h"
#include "Opcodes.h"
src/server/game/Server/WorldSession.cpp
-1
View File
@@ -43,7 +43,6 @@
#include "QueryHolder.h"
#include "ScriptMgr.h"
#include "SocialMgr.h"
#include "Tokenize.h"
#include "Transport.h"
#include "Vehicle.h"
#include "WardenWin.h"
src/server/game/Server/WorldSocket.cpp
+2
View File
@@ -33,6 +33,8 @@
#include "zlib.h"
#include <memory>
#include "ServerPktHeader.h"
using boost::asio::ip::tcp;
void compressBuff(void* dst, uint32* dst_size, void* src, int src_size)
src/server/game/Server/WorldSocket.h
-1
View File
@@ -21,7 +21,6 @@
#include "AuthCrypt.h"
#include "Common.h"
#include "MPSCQueue.h"
#include "ServerPktHeader.h"
#include "Socket.h"
#include "Util.h"
#include "WorldPacket.h"
src/server/game/Spells/Spell.cpp
+2 -1
View File
@@ -47,7 +47,6 @@
#include "SpellScript.h"
#include "TemporarySummon.h"
#include "Unit.h"
#include "UpdateData.h"
#include "Util.h"
#include "VMapFactory.h"
#include "Vehicle.h"
@@ -60,6 +59,8 @@
// there is probably some underlying problem with imports which should properly addressed
// see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766
#include "GridNotifiersImpl.h"
#include "IVMapMgr.h"
#include "VMapMgr2.h"
extern pEffect SpellEffects[TOTAL_SPELL_EFFECTS];
src/server/game/Spells/SpellInfo.cpp
+1
View File
@@ -18,6 +18,7 @@
#include "SpellInfo.h"
#include "Chat.h"
#include "ConditionMgr.h"
#include "Corpse.h"
#include "DBCStores.h"
#include "LootMgr.h"
#include "Player.h"
src/server/game/Texts/CreatureTextMgr.h
-1
View File
@@ -21,7 +21,6 @@
#include "Creature.h"
#include "GridNotifiers.h"
#include "ObjectAccessor.h"
#include "Opcodes.h"
#include "SharedDefines.h"
#include "WorldSession.h"
src/server/game/Tools/PlayerDump.h
-1
View File
@@ -19,7 +19,6 @@
#define _PLAYER_DUMP_H
#include "ObjectGuid.h"
#include <iosfwd>
#include <map>
#include <set>
#include <string>
src/server/game/Warden/Warden.cpp
-1
View File
@@ -24,7 +24,6 @@
#include "Opcodes.h"
#include "Player.h"
#include "SharedDefines.h"
#include "Util.h"
#include "World.h"
#include "WorldPacket.h"
#include "WorldSession.h"
src/server/game/Warden/WardenMac.h
-2
View File
@@ -18,10 +18,8 @@
#ifndef _WARDEN_MAC_H
#define _WARDEN_MAC_H
#include "ARC4.h"
#include "ByteBuffer.h"
#include "Warden.h"
#include <map>
class WorldSession;
class Warden;
src/server/game/Warden/WardenWin.h
-2
View File
@@ -19,8 +19,6 @@
#define _WARDEN_WIN_H
#include "ByteBuffer.h"
#include "Cryptography/ARC4.h"
#include "Cryptography/BigNumber.h"
#include "Warden.h"
#include <list>
src/server/game/Weather/Weather.h
-1
View File
@@ -22,7 +22,6 @@
#ifndef __WEATHER_H
#define __WEATHER_H
#include "Common.h"
#include "SharedDefines.h"
#include "Timer.h"