From f6bfb9a2ed6b9bdf71f3391797ff9f94df8a509f Mon Sep 17 00:00:00 2001 From: ratkosrb Date: Thu, 20 Jun 2019 23:35:51 +0300 Subject: [PATCH] Reject movement packet if a cheat is detected. Completely neutralizes some cheats, without kicking innocent players on false positive. The packet is rejected and correct position and flags are sent back to the client. --- src/game/Anticheat/Anticheat.h | 5 +- .../MovementAnticheat/MovementAnticheat.cpp | 234 ++++++--- .../MovementAnticheat/MovementAnticheat.h | 38 +- src/game/Handlers/MovementHandler.cpp | 180 ++++--- src/game/World.cpp | 116 +++-- src/game/World.h | 104 ++-- src/game/WorldSession.cpp | 2 +- src/game/WorldSession.h | 1 + src/mangosd/mangosd.conf.dist.in | 492 +++++++++++------- 9 files changed, 728 insertions(+), 444 deletions(-) diff --git a/src/game/Anticheat/Anticheat.h b/src/game/Anticheat/Anticheat.h index 852a0453b..82ef08e90 100644 --- a/src/game/Anticheat/Anticheat.h +++ b/src/game/Anticheat/Anticheat.h @@ -24,7 +24,6 @@ enum CheatAction CHEAT_ACTION_KICK = 0x04, CHEAT_ACTION_BAN_ACCOUNT = 0x08, CHEAT_ACTION_BAN_IP_ACCOUNT = 0x10, - CHEAT_ACTION_TELEPORT_BACK = 0x20, CHEAT_ACTION_MUTE_PUB_CHANS = 0x40, // Mutes the account from public channels CHEAT_MAX_ACTIONS, }; @@ -75,8 +74,8 @@ class MovementAnticheatInterface virtual bool HandleAnticheatTests(Player* pPlayer, MovementInfo& movementInfo, uint16 opcode) { return true; } virtual bool HandleSpeedChangeAck(Player* pPlayer, MovementInfo& movementInfo, float speedReceived, UnitMoveType moveType, uint16 opcode) { return true; } - virtual bool CheckTeleport(Player* pPlayer, MovementInfo& movementInfo, uint32 opcode) { return true; } - virtual void CheckMovementFlags(Player* pPlayer, MovementInfo& movementInfo) { } + virtual bool CheckTeleport(Player* pPlayer, MovementInfo const& movementInfo, uint32 opcode) { return true; } + virtual bool HandleMovementFlags(Player* pPlayer, MovementInfo& movementInfo) { return true; } virtual void InitSpeeds(Unit* unit) {} virtual bool InterpolateMovement(MovementInfo const& mi, uint32 diffMs, float &x, float &y, float &z, float &o) { return true; } diff --git a/src/game/Anticheat/MovementAnticheat/MovementAnticheat.cpp b/src/game/Anticheat/MovementAnticheat/MovementAnticheat.cpp index a8600899d..83f7710d8 100644 --- a/src/game/Anticheat/MovementAnticheat/MovementAnticheat.cpp +++ b/src/game/Anticheat/MovementAnticheat/MovementAnticheat.cpp @@ -18,50 +18,56 @@ const char* GetMovementCheatName(CheatType flagId) { switch (flagId) { - case CHEAT_TYPE_WATER_WALK: - return "WaterWalk"; - case CHEAT_TYPE_FORBIDDEN: - return "ForbiddenArea"; - case CHEAT_TYPE_MULTIJUMP: - return "MultiJump"; - case CHEAT_TYPE_PVE_FLYHACK: - return "PvEUnreachable"; case CHEAT_TYPE_TIME_BACK: return "ReverseTime"; + case CHEAT_TYPE_NULL_CLIENT_TIME: + return "NullClientTime"; + case CHEAT_TYPE_SKIPPED_HEARTBEATS: + return "SkippedHeartbeats"; + case CHEAT_TYPE_DESYNC: + return "TimeDesync"; + case CHEAT_TYPE_NUM_DESYNC: + return "NumDesyncs"; + case CHEAT_TYPE_OVERSPEED_DIST: + return "OverspeedDist"; + case CHEAT_TYPE_OVERSPEED_Z: + return "OverspeedZ"; case CHEAT_TYPE_OVERSPEED_JUMP: return "OverspeedJump"; case CHEAT_TYPE_JUMP_SPEED_CHANGE: return "JumpSpeedChange"; + case CHEAT_TYPE_MULTIJUMP: + return "MultiJump"; + case CHEAT_TYPE_PVE_FLYHACK: + return "PvEUnreachable"; case CHEAT_TYPE_FLY_HACK_SWIM: return "FlyHackSwim"; - case CHEAT_TYPE_ROOT_MOVE: - return "MovementRooted"; - case CHEAT_TYPE_OVERSPEED_DIST: - return "OverspeedDist"; - case CHEAT_TYPE_DESYNC: - return "TimeDesync"; - case CHEAT_TYPE_EXPLORE: - return "Exploration"; - case CHEAT_TYPE_EXPLORE_HIGH_LEVEL: - return "ExploreHighLevelArea"; - case CHEAT_TYPE_OVERSPEED_Z: - return "OverspeedZ"; - case CHEAT_TYPE_SKIPPED_HEARTBEATS: - return "SkippedHeartbeats"; - case CHEAT_TYPE_NUM_DESYNC: - return "NumDesyncs"; + case CHEAT_TYPE_TELEPORT: + return "TeleportHack"; + case CHEAT_TYPE_TELEPORT_TRANSPORT: + return "TeleToTransport"; case CHEAT_TYPE_FAKE_TRANSPORT: return "FakeTransport"; - case CHEAT_TYPE_TELE_TO_TRANSPORT: - return "TeleToTransport"; + case CHEAT_TYPE_WATER_WALK: + return "WaterWalk"; case CHEAT_TYPE_SLOW_FALL: return "SlowFall"; + case CHEAT_TYPE_HOVER: + return "Hover"; case CHEAT_TYPE_FIXED_Z: return "FixedZ"; + case CHEAT_TYPE_ROOT_MOVE: + return "MovementRooted"; case CHEAT_TYPE_WRONG_ACK_DATA: return "WrongAckData"; case CHEAT_TYPE_PENDING_ACK_DELAY: return "PendingAckDelay"; + case CHEAT_TYPE_EXPLORE: + return "Exploration"; + case CHEAT_TYPE_EXPLORE_HIGH_LEVEL: + return "ExploreHighLevelArea"; + case CHEAT_TYPE_FORBIDDEN_AREA: + return "ForbiddenArea"; } return "UnknownCheat"; @@ -143,7 +149,7 @@ void MovementCheatData::StoreCheat(uint32 type, uint32 count) m_cheatOccuranceTick[type] += count; } -uint32 MovementCheatData::ComputeCheatAction(std::stringstream& reason) const +uint32 MovementCheatData::ComputeCheatAction(std::stringstream& reason) { uint32 action = CHEAT_ACTION_NONE; @@ -162,32 +168,40 @@ uint32 MovementCheatData::ComputeCheatAction(std::stringstream& reason) const reason << "/"; reason << GetMovementCheatName(cheatType) << "(Tick:" << count << ")"; action |= penalty; + + if (total) + m_cheatOccuranceTotal[cheatType] = 0; } } }; - AddPenaltyForCheat(true, CHEAT_TYPE_WATER_WALK, CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_FORBIDDEN, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_MULTIJUMP, CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_PENALTY); - AddPenaltyForCheat(true, CHEAT_TYPE_PVE_FLYHACK, CONFIG_BOOL_AC_MOVEMENT_CHEAT_UNREACHABLE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_PENALTY); AddPenaltyForCheat(false, CHEAT_TYPE_TIME_BACK, CONFIG_BOOL_AC_MOVEMENT_CHEAT_REVERSE_TIME_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_REVERSE_TIME_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_REVERSE_TIME_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_OVERSPEED_JUMP, CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_JUMP_SPEED_CHANGE, CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_FLY_HACK_SWIM, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_ROOT_MOVE, CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_OVERSPEED_DIST, CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_DESYNC, CONFIG_BOOL_AC_MOVEMENT_CHEAT_TIME_DESYNC_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_PENALTY); - AddPenaltyForCheat(true, CHEAT_TYPE_EXPLORE, CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_PENALTY); - AddPenaltyForCheat(true, CHEAT_TYPE_EXPLORE_HIGH_LEVEL, CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_OVERSPEED_Z, CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_Z_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_NULL_CLIENT_TIME, CONFIG_BOOL_AC_MOVEMENT_CHEAT_NULL_TIME_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_NULL_TIME_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_NULL_TIME_PENALTY); AddPenaltyForCheat(false, CHEAT_TYPE_SKIPPED_HEARTBEATS, CONFIG_BOOL_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_DESYNC, CONFIG_BOOL_AC_MOVEMENT_CHEAT_TIME_DESYNC_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_PENALTY); AddPenaltyForCheat(false, CHEAT_TYPE_NUM_DESYNC, CONFIG_BOOL_AC_MOVEMENT_CHEAT_NUM_DESYNCS_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_OVERSPEED_DIST, CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_OVERSPEED_Z, CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_Z_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_OVERSPEED_JUMP, CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_JUMP_SPEED_CHANGE, CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_MULTIJUMP, CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD_TICK, CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_MULTIJUMP, CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD_TOTAL, CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_PVE_FLYHACK, CONFIG_BOOL_AC_MOVEMENT_CHEAT_UNREACHABLE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_FLY_HACK_SWIM, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_TELEPORT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_TELEPORT_TRANSPORT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_PENALTY); AddPenaltyForCheat(false, CHEAT_TYPE_FAKE_TRANSPORT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_PENALTY); - AddPenaltyForCheat(false, CHEAT_TYPE_TELE_TO_TRANSPORT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_PENALTY); - AddPenaltyForCheat(true, CHEAT_TYPE_SLOW_FALL, CONFIG_BOOL_AC_MOVEMENT_CHEAT_SLOW_FALL_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_PENALTY); - AddPenaltyForCheat(true, CHEAT_TYPE_FIXED_Z, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FIXED_Z_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_WATER_WALK, CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_SLOW_FALL, CONFIG_BOOL_AC_MOVEMENT_CHEAT_SLOW_FALL_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_HOVER, CONFIG_BOOL_AC_MOVEMENT_CHEAT_HOVER_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_HOVER_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_HOVER_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_FIXED_Z, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FIXED_Z_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_ROOT_MOVE, CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD_TICK, CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_ROOT_MOVE, CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD_TOTAL, CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_PENALTY); AddPenaltyForCheat(true, CHEAT_TYPE_WRONG_ACK_DATA, CONFIG_BOOL_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_PENALTY); AddPenaltyForCheat(true, CHEAT_TYPE_PENDING_ACK_DELAY, CONFIG_BOOL_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_EXPLORE, CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_PENALTY); + AddPenaltyForCheat(true, CHEAT_TYPE_EXPLORE_HIGH_LEVEL, CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_PENALTY); + AddPenaltyForCheat(false, CHEAT_TYPE_FORBIDDEN_AREA, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_ENABLED, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_PENALTY); return action; } @@ -301,6 +315,55 @@ UnitMoveType MovementCheatData::GetMoveTypeFromLastFlags() return GetLastMovementInfo().HasMovementFlag(MOVEFLAG_BACKWARD) ? MOVE_RUN_BACK : MOVE_RUN; } +bool ShouldRejectMovement(uint32 cheatFlags) +{ + if ((cheatFlags & (1 << CHEAT_TYPE_OVERSPEED_JUMP)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_JUMP_SPEED_CHANGE)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_MULTIJUMP)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_FLY_HACK_SWIM)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_TELEPORT)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_TELEPORT_TRANSPORT)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_WATER_WALK)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_SLOW_FALL)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_SLOW_FALL_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_HOVER)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_HOVER_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_FIXED_Z)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FIXED_Z_REJECT)) + return true; + + if ((cheatFlags & (1 << CHEAT_TYPE_ROOT_MOVE)) && + sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_REJECT)) + return true; + + return false; +} + bool MovementCheatData::HandleAnticheatTests(Player* pPlayer, MovementInfo& movementInfo, uint16 opcode) { if (!sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_ENABLED) || @@ -310,8 +373,8 @@ bool MovementCheatData::HandleAnticheatTests(Player* pPlayer, MovementInfo& move if (pPlayer != me) InitNewPlayer(pPlayer); - uint32 cheatType = 0x0; -#define APPEND_CHEAT(t) cheatType |= (1 << t) + uint32 cheatFlags = 0x0; +#define APPEND_CHEAT(t) cheatFlags |= (1 << t) if (opcode == CMSG_MOVE_FEATHER_FALL_ACK) { @@ -329,7 +392,10 @@ bool MovementCheatData::HandleAnticheatTests(Player* pPlayer, MovementInfo& move if (GetLastMovementInfo().jump.xyspeed > 0.0001f) APPEND_CHEAT(CHEAT_TYPE_JUMP_SPEED_CHANGE); - if ((movementInfo.moveFlags & MOVEFLAG_MASK_MOVING) && ((movementInfo.moveFlags & MOVEFLAG_ROOT) || (GetLastMovementInfo().moveFlags & MOVEFLAG_ROOT)) && !me->HasPendingMovementChange(ROOT)) + if ((movementInfo.moveFlags & MOVEFLAG_MASK_MOVING) && + ((movementInfo.moveFlags & MOVEFLAG_ROOT) || (GetLastMovementInfo().moveFlags & MOVEFLAG_ROOT)) && + !me->HasPendingMovementChange(ROOT) && + (opcode != CMSG_FORCE_MOVE_UNROOT_ACK)) APPEND_CHEAT(CHEAT_TYPE_ROOT_MOVE); if (sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED)) @@ -369,7 +435,7 @@ bool MovementCheatData::HandleAnticheatTests(Player* pPlayer, MovementInfo& move } if (CheckForbiddenArea(movementInfo)) - APPEND_CHEAT(CHEAT_TYPE_FORBIDDEN); + APPEND_CHEAT(CHEAT_TYPE_FORBIDDEN_AREA); // Minimal checks on transports if (movementInfo.moveFlags & MOVEFLAG_ONTRANSPORT) @@ -380,7 +446,7 @@ bool MovementCheatData::HandleAnticheatTests(Player* pPlayer, MovementInfo& move float dist2d = (movementInfo.pos.x - GetLastMovementInfo().pos.x) * (movementInfo.pos.x - GetLastMovementInfo().pos.x); dist2d += (movementInfo.pos.y - GetLastMovementInfo().pos.y) * (movementInfo.pos.y - GetLastMovementInfo().pos.y); if (dist2d > 100*100) - APPEND_CHEAT(CHEAT_TYPE_TELE_TO_TRANSPORT); + APPEND_CHEAT(CHEAT_TYPE_TELEPORT_TRANSPORT); } } @@ -453,13 +519,19 @@ bool MovementCheatData::HandleAnticheatTests(Player* pPlayer, MovementInfo& move m_knockBack = false; } - AddCheats(cheatType); + AddCheats(cheatFlags); + + if (ShouldRejectMovement(cheatFlags)) + { + me->SendHeartBeat(true); + return false; + } return true; #undef APPEND_CHEAT } -bool MovementCheatData::CheckForbiddenArea(MovementInfo& movementInfo) const +bool MovementCheatData::CheckForbiddenArea(MovementInfo const& movementInfo) const { switch(me->GetMapId()) { @@ -736,7 +808,7 @@ bool MovementCheatData::GetMaxAllowedDist(MovementInfo const& mi, uint32 diffMs, return true; } -bool MovementCheatData::CheckTeleport(Player* pPlayer, MovementInfo& movementInfo, uint32 opcode) +bool MovementCheatData::CheckTeleport(Player* pPlayer, MovementInfo const& movementInfo, uint32 opcode) { if (!sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_ENABLED) || !sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_ENABLED) || @@ -752,17 +824,15 @@ bool MovementCheatData::CheckTeleport(Player* pPlayer, MovementInfo& movementInf if (!IsTeleportAllowed(movementInfo, distance)) { - uint32 penalty = sWorld.getConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_PENALTY); + AddCheats(1 << CHEAT_TYPE_TELEPORT); - if (penalty & CHEAT_ACTION_TELEPORT_BACK) + if (sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_REJECT)) { // save prevoius point Player::SavePositionInDB(me->GetObjectGuid(), me->GetMapId(), me->m_movementInfo.pos.x, me->m_movementInfo.pos.y, me->m_movementInfo.pos.z, me->m_movementInfo.pos.o, me->GetZoneId()); me->NearLandTo(me->m_movementInfo.pos.x, me->m_movementInfo.pos.y, me->m_movementInfo.pos.z, me->GetOrientation()); + return false; } - - m_session->ProcessAnticheatAction("MovementAnticheat", "TeleportHack", penalty); - return false; } } @@ -808,11 +878,11 @@ bool MovementCheatData::IsTeleportAllowed(MovementInfo const& movementInfo, floa return false; } -void MovementCheatData::CheckMovementFlags(Player* pPlayer, MovementInfo& movementInfo) +bool MovementCheatData::HandleMovementFlags(Player* pPlayer, MovementInfo& movementInfo) { if (!sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_ENABLED) || (m_session->GetSecurity() != SEC_PLAYER)) - return; + return true; if (me != pPlayer) InitNewPlayer(pPlayer); @@ -822,46 +892,60 @@ void MovementCheatData::CheckMovementFlags(Player* pPlayer, MovementInfo& moveme auto const currentMoveFlags = movementInfo.GetMovementFlags(); uint32 removeMoveFlags = 0; + uint32 cheatFlags = 0x0; +#define APPEND_CHEAT(t) cheatFlags |= (1 << t) + // This flag is only for creatures. if (currentMoveFlags & MOVEFLAG_FIXED_Z) { - AddCheats(1 << CHEAT_TYPE_FIXED_Z); + APPEND_CHEAT(CHEAT_TYPE_FIXED_Z); removeMoveFlags |= MOVEFLAG_FIXED_Z; } // This flag is only for creatures. if (currentMoveFlags & MOVEFLAG_LEVITATING) { - AddCheats(1 << CHEAT_TYPE_FLY_HACK_SWIM); + APPEND_CHEAT(CHEAT_TYPE_FLY_HACK_SWIM); removeMoveFlags |= MOVEFLAG_LEVITATING; } if ((currentMoveFlags & MOVEFLAG_SWIMMING) && (currentMoveFlags & MOVEFLAG_FLYING)) { - AddCheats(1 << CHEAT_TYPE_FLY_HACK_SWIM); + APPEND_CHEAT(CHEAT_TYPE_FLY_HACK_SWIM); removeMoveFlags |= MOVEFLAG_SWIMMING | MOVEFLAG_FLYING; } - if ((currentMoveFlags & MOVEFLAG_WATERWALKING) && !me->HasAuraType(SPELL_AURA_WATER_WALK) && !me->HasAuraType(SPELL_AURA_GHOST)) + if ((currentMoveFlags & MOVEFLAG_WATERWALKING) && !me->HasAuraType(SPELL_AURA_WATER_WALK) && !me->HasAuraType(SPELL_AURA_GHOST) && !me->HasPendingMovementChange(WATER_WALK)) { - if (!me->GetMover()->HasPendingMovementChange(WATER_WALK)) - { - AddCheats(1 << CHEAT_TYPE_WATER_WALK); - removeMoveFlags |= MOVEFLAG_WATERWALKING; - } + APPEND_CHEAT(CHEAT_TYPE_WATER_WALK); + removeMoveFlags |= MOVEFLAG_WATERWALKING; } - if ((currentMoveFlags & MOVEFLAG_SAFE_FALL) && !me->HasAuraType(SPELL_AURA_FEATHER_FALL)) + if ((currentMoveFlags & MOVEFLAG_SAFE_FALL) && !me->HasAuraType(SPELL_AURA_FEATHER_FALL) && !me->HasPendingMovementChange(FEATHER_FALL)) { - if (!me->GetMover()->HasPendingMovementChange(FEATHER_FALL)) - { - AddCheats(1 << CHEAT_TYPE_SLOW_FALL); - removeMoveFlags |= MOVEFLAG_SAFE_FALL; - } + APPEND_CHEAT(CHEAT_TYPE_SLOW_FALL); + removeMoveFlags |= MOVEFLAG_SAFE_FALL; } - if (removeMoveFlags) - movementInfo.RemoveMovementFlag(MovementFlags(removeMoveFlags)); + if ((currentMoveFlags & MOVEFLAG_HOVER) && !me->HasAuraType(SPELL_AURA_HOVER) && !me->HasPendingMovementChange(SET_HOVER)) + { + APPEND_CHEAT(CHEAT_TYPE_HOVER); + removeMoveFlags |= MOVEFLAG_HOVER; + } +#undef APPEND_CHEAT + + AddCheats(cheatFlags); + + if (ShouldRejectMovement(cheatFlags)) + { + printf("reject flags\n"); + me->SendHeartBeat(true); + return false; + } + else if (removeMoveFlags) + movementInfo.RemoveMovementFlag(removeMoveFlags); } + + return true; } diff --git a/src/game/Anticheat/MovementAnticheat/MovementAnticheat.h b/src/game/Anticheat/MovementAnticheat/MovementAnticheat.h index d0946c69d..f9b61b87d 100644 --- a/src/game/Anticheat/MovementAnticheat/MovementAnticheat.h +++ b/src/game/Anticheat/MovementAnticheat/MovementAnticheat.h @@ -9,29 +9,31 @@ enum CheatType { - CHEAT_TYPE_WATER_WALK, - CHEAT_TYPE_FORBIDDEN, - CHEAT_TYPE_MULTIJUMP, - CHEAT_TYPE_PVE_FLYHACK, CHEAT_TYPE_TIME_BACK, + CHEAT_TYPE_NULL_CLIENT_TIME, + CHEAT_TYPE_SKIPPED_HEARTBEATS, + CHEAT_TYPE_DESYNC, + CHEAT_TYPE_NUM_DESYNC, + CHEAT_TYPE_OVERSPEED_DIST, + CHEAT_TYPE_OVERSPEED_Z, CHEAT_TYPE_OVERSPEED_JUMP, CHEAT_TYPE_JUMP_SPEED_CHANGE, + CHEAT_TYPE_MULTIJUMP, + CHEAT_TYPE_PVE_FLYHACK, CHEAT_TYPE_FLY_HACK_SWIM, - CHEAT_TYPE_NULL_CLIENT_TIME, - CHEAT_TYPE_ROOT_MOVE, - CHEAT_TYPE_OVERSPEED_DIST, - CHEAT_TYPE_DESYNC, - CHEAT_TYPE_EXPLORE, - CHEAT_TYPE_EXPLORE_HIGH_LEVEL, - CHEAT_TYPE_OVERSPEED_Z, - CHEAT_TYPE_SKIPPED_HEARTBEATS, - CHEAT_TYPE_NUM_DESYNC, + CHEAT_TYPE_TELEPORT, + CHEAT_TYPE_TELEPORT_TRANSPORT, CHEAT_TYPE_FAKE_TRANSPORT, - CHEAT_TYPE_TELE_TO_TRANSPORT, + CHEAT_TYPE_WATER_WALK, CHEAT_TYPE_SLOW_FALL, + CHEAT_TYPE_HOVER, CHEAT_TYPE_FIXED_Z, + CHEAT_TYPE_ROOT_MOVE, CHEAT_TYPE_WRONG_ACK_DATA, CHEAT_TYPE_PENDING_ACK_DELAY, + CHEAT_TYPE_EXPLORE, + CHEAT_TYPE_EXPLORE_HIGH_LEVEL, + CHEAT_TYPE_FORBIDDEN_AREA, CHEATS_COUNT }; @@ -53,7 +55,7 @@ class MovementCheatData: public MovementAnticheatInterface void AddCheats(uint32 cheats, uint32 count = 1) override; void StoreCheat(uint32 type, uint32 count = 1); - uint32 ComputeCheatAction(std::stringstream& reason) const; + uint32 ComputeCheatAction(std::stringstream& reason); void OnUnreachable(Unit* attacker) override; void OnExplore(AreaEntry const* pArea) override; @@ -68,9 +70,9 @@ class MovementCheatData: public MovementAnticheatInterface bool HandleSpeedChangeAck(Player* pPlayer, MovementInfo& movementInfo, float speedReceived, UnitMoveType moveType, uint16 opcode) override; bool IsTeleportAllowed(MovementInfo const& movementInfo, float& distance); - bool CheckTeleport(Player* pPlayer, MovementInfo& movementInfo, uint32 opcode) override; - void CheckMovementFlags(Player* pPlayer, MovementInfo& movementInfo) override; - bool CheckForbiddenArea(MovementInfo& movementInfo) const; + bool CheckTeleport(Player* pPlayer, MovementInfo const& movementInfo, uint32 opcode) override; + bool HandleMovementFlags(Player* pPlayer, MovementInfo& movementInfo) override; + bool CheckForbiddenArea(MovementInfo const& movementInfo) const; bool InterpolateMovement(MovementInfo const& mi, uint32 diffMs, float &x, float &y, float &z, float &o) override; bool GetMaxAllowedDist(MovementInfo const& mi, uint32 diffMs, float &dxy, float &dz); UnitMoveType GetMoveTypeFromLastFlags(); diff --git a/src/game/Handlers/MovementHandler.cpp b/src/game/Handlers/MovementHandler.cpp index 001b6e0a5..b77554873 100644 --- a/src/game/Handlers/MovementHandler.cpp +++ b/src/game/Handlers/MovementHandler.cpp @@ -281,6 +281,10 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData) uint32 const opcode = recvData.GetOpcode(); DEBUG_LOG("WORLD: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(opcode), opcode, opcode); + // Do not accept packets sent before this time. + if (recvData.GetPacketTime() <= m_moveRejectTime) + return; + Unit* pMover = _player->GetMover(); if (pMover->GetObjectGuid() != _clientMoverGuid) @@ -306,13 +310,13 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData) if (pPlayerMover) { - if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode)) + if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode) || + !_player->GetCheatData()->HandleAnticheatTests(pPlayerMover, movementInfo, opcode) || + !_player->GetCheatData()->HandleMovementFlags(pPlayerMover, movementInfo)) + { + m_moveRejectTime = WorldTimer::getMSTime(); return; - - if (!_player->GetCheatData()->HandleAnticheatTests(pPlayerMover, movementInfo, opcode)) - return; - - _player->GetCheatData()->CheckMovementFlags(pPlayerMover, movementInfo); + } } // Interrupt spell cast at move @@ -443,20 +447,6 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket &recvData) if (!pMover) return; - Player* pPlayerMover = pMover->ToPlayer(); - - if (!VerifyMovementInfo(movementInfo)) - return; - - if (pPlayerMover) - { - if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode)) - return; - - if (!_player->GetCheatData()->HandleSpeedChangeAck(pPlayerMover, movementInfo, speedReceived, move_type, opcode)) - return; - } - // verify that indeed the client is replying with the changes that were send to him if (!pMover->HasPendingMovementChange()) { @@ -474,13 +464,39 @@ void WorldSession::HandleForceSpeedChangeAckOpcodes(WorldPacket &recvData) return; } - // the client data has been verified. let's do the actual change now + // the client data has been verified, let's do the actual change now float newSpeedRate = speedReceived / baseMoveSpeed[move_type]; - HandleMoverRelocation(movementInfo); - if (pPlayerMover) - pPlayerMover->UpdateFallInformationIfNeed(movementInfo, opcode); pMover->SetSpeedRateReal(move_type, newSpeedRate); + // Use lambda here to handle movement position checks separately from change ACK. + auto HandleMovementPositionChange = [&recvData, &pMover, &movementInfo, &speedReceived, &move_type, &opcode, this]() + { + // Do not accept packets sent before this time. + if (recvData.GetPacketTime() <= m_moveRejectTime) + return; + + Player* pPlayerMover = pMover->ToPlayer(); + + if (!VerifyMovementInfo(movementInfo)) + return; + + if (pPlayerMover) + { + if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode) || + !_player->GetCheatData()->HandleSpeedChangeAck(pPlayerMover, movementInfo, speedReceived, move_type, opcode) || + !_player->GetCheatData()->HandleMovementFlags(pPlayerMover, movementInfo)) + { + m_moveRejectTime = WorldTimer::getMSTime(); + return; + } + } + + HandleMoverRelocation(movementInfo); + if (pPlayerMover) + pPlayerMover->UpdateFallInformationIfNeed(movementInfo, opcode); + }; + + HandleMovementPositionChange(); MovementPacketSender::SendSpeedChangeToObservers(pMover, move_type, speedReceived); } @@ -519,20 +535,6 @@ void WorldSession::HandleMovementFlagChangeToggleAck(WorldPacket& recvData) if (!pMover) return; - Player* pPlayerMover = pMover->ToPlayer(); - - if (!VerifyMovementInfo(movementInfo)) - return; - - if (pPlayerMover) - { - if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode)) - return; - - if (!_player->GetCheatData()->HandleAnticheatTests(pPlayerMover, movementInfo, opcode)) - return; - } - // verify that indeed the client is replying with the changes that were send to him if (!pMover->HasPendingMovementChange()) { @@ -563,10 +565,35 @@ void WorldSession::HandleMovementFlagChangeToggleAck(WorldPacket& recvData) return; } - // Position change - HandleMoverRelocation(movementInfo); - if (pPlayerMover) - pPlayerMover->UpdateFallInformationIfNeed(movementInfo, opcode); + // Use lambda here to handle movement position checks separately from change ACK. + auto HandleMovementPositionChange = [&recvData, &pMover, &movementInfo, &opcode, this]() + { + // Do not accept packets sent before this time. + if (recvData.GetPacketTime() <= m_moveRejectTime) + return; + + Player* pPlayerMover = pMover->ToPlayer(); + + if (!VerifyMovementInfo(movementInfo)) + return; + + if (pPlayerMover) + { + if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode) || + !_player->GetCheatData()->HandleAnticheatTests(pPlayerMover, movementInfo, opcode)) + { + m_moveRejectTime = WorldTimer::getMSTime(); + return; + } + } + + // Position change + HandleMoverRelocation(movementInfo); + if (pPlayerMover) + pPlayerMover->UpdateFallInformationIfNeed(movementInfo, opcode); + }; + + HandleMovementPositionChange(); switch (changeTypeReceived) { @@ -613,20 +640,6 @@ void WorldSession::HandleMoveRootAck(WorldPacket& recvData) if (!pMover) return; - if (!VerifyMovementInfo(movementInfo)) - return; - - Player* pPlayerMover = pMover->ToPlayer(); - - if (pPlayerMover) - { - if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode)) - return; - - if (!_player->GetCheatData()->HandleAnticheatTests(pPlayerMover, movementInfo, opcode)) - return; - } - // verify that indeed the client is replying with the changes that were send to him if (!pMover->HasPendingMovementChange()) { @@ -646,12 +659,36 @@ void WorldSession::HandleMoveRootAck(WorldPacket& recvData) return; } - // Update position if it has changed - HandleMoverRelocation(movementInfo); - if (pPlayerMover) - pPlayerMover->UpdateFallInformationIfNeed(movementInfo, opcode); - pMover->SetRootedReal(applyReceived); + // Use lambda here to handle movement position checks separately from change ACK. + auto HandleMovementPositionChange = [&recvData, &pMover, &movementInfo, &opcode, this]() + { + // Do not accept packets sent before this time. + if (recvData.GetPacketTime() <= m_moveRejectTime) + return; + if (!VerifyMovementInfo(movementInfo)) + return; + + Player* pPlayerMover = pMover->ToPlayer(); + + if (pPlayerMover) + { + if (!_player->GetCheatData()->CheckTeleport(pPlayerMover, movementInfo, opcode) || + !_player->GetCheatData()->HandleAnticheatTests(pPlayerMover, movementInfo, opcode)) + { + m_moveRejectTime = WorldTimer::getMSTime(); + return; + } + } + + // Update position if it has changed + HandleMoverRelocation(movementInfo); + if (pPlayerMover) + pPlayerMover->UpdateFallInformationIfNeed(movementInfo, opcode); + }; + + HandleMovementPositionChange(); + pMover->SetRootedReal(applyReceived); MovementPacketSender::SendMovementFlagChangeToObservers(pMover, MOVEFLAG_ROOT, applyReceived); // Set unit client state for brevity, though it should not be used @@ -783,12 +820,12 @@ void WorldSession::HandleMoveNotActiveMoverOpcode(WorldPacket &recvData) DEBUG_LOG("WORLD: Recvd CMSG_MOVE_NOT_ACTIVE_MOVER"); recvData.hexlike(); - MovementInfo mi; + MovementInfo movementInfo; #if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_9_4 ObjectGuid old_mover_guid; recvData >> old_mover_guid; - recvData >> mi; + recvData >> movementInfo; _clientMoverGuid = ObjectGuid(); // Client sent not active mover, but maybe the mover is actually set? @@ -802,15 +839,22 @@ void WorldSession::HandleMoveNotActiveMoverOpcode(WorldPacket &recvData) return; } #else - recvData >> mi; + recvData >> movementInfo; _clientMoverGuid = ObjectGuid(); #endif - // Prevent client from removing root flag. - if (_player->HasUnitMovementFlag(MOVEFLAG_ROOT) && !mi.HasMovementFlag(MOVEFLAG_ROOT)) - mi.AddMovementFlag(MOVEFLAG_ROOT); + if (!_player->GetCheatData()->CheckTeleport(_player, movementInfo, recvData.GetOpcode()) || + !_player->GetCheatData()->HandleAnticheatTests(_player, movementInfo, recvData.GetOpcode()) || + !_player->GetCheatData()->HandleMovementFlags(_player, movementInfo)) + { + return; + } - _player->m_movementInfo = mi; + // Prevent client from removing root flag. + if (_player->HasUnitMovementFlag(MOVEFLAG_ROOT) && !movementInfo.HasMovementFlag(MOVEFLAG_ROOT)) + movementInfo.AddMovementFlag(MOVEFLAG_ROOT); + + _player->m_movementInfo = movementInfo; } void WorldSession::HandleMountSpecialAnimOpcode(WorldPacket& /*recvdata*/) diff --git a/src/game/World.cpp b/src/game/World.cpp index 1a986b2d0..ba233e7c3 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1002,76 +1002,96 @@ void World::LoadConfigSettings(bool reload) setConfig(CONFIG_UINT32_AC_MOVEMENT_BAN_DURATION, "Anticheat.BanDuration", 86400); setConfig(CONFIG_BOOL_AC_MOVEMENT_LOG_DATA, "Anticheat.LogData", false); setConfig(CONFIG_INT32_AC_ANTICHEAT_MAX_ALLOWED_DESYNC, "Anticheat.MaxAllowedDesync", 0); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED, "Anticheat.MultiJump.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD, "Anticheat.MultiJump.Threshold", 2); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_PENALTY, "Anticheat.MultiJump.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_SPEED_HACK_ENABLED, "Anticheat.SpeedHack.Enable", true); - setConfig(CONFIG_BOOL_AC_MOVEMENT_USE_INTERPOLATION, "Anticheat.SpeedHack.UseInterpolation", true); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_ENABLED, "Anticheat.WaterWalk.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_THRESHOLD, "Anticheat.WaterWalk.Threshold", 10); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_PENALTY, "Anticheat.WaterWalk.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_ENABLED, "Anticheat.ForbiddenArea.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_THRESHOLD, "Anticheat.ForbiddenArea.Threshold", 1); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_PENALTY, "Anticheat.ForbiddenArea.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_UNREACHABLE_ENABLED, "Anticheat.Unreachable.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_THRESHOLD, "Anticheat.Unreachable.Threshold", 40); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_PENALTY, "Anticheat.Unreachable.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_REVERSE_TIME_ENABLED, "Anticheat.ReverseTime.Enable", true); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_REVERSE_TIME_THRESHOLD, "Anticheat.ReverseTime.Threshold", 1); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_REVERSE_TIME_PENALTY, "Anticheat.ReverseTime.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_ENABLED, "Anticheat.OverspeedJump.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_THRESHOLD, "Anticheat.OverspeedJump.Threshold", 1); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_PENALTY, "Anticheat.OverspeedJump.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_ENABLED, "Anticheat.JumpSpeedChange.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_THRESHOLD, "Anticheat.JumpSpeedChange.Threshold", 1); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_PENALTY, "Anticheat.JumpSpeedChange.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_ENABLED, "Anticheat.FlyHack.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_THRESHOLD, "Anticheat.FlyHack.Threshold", 3); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_PENALTY, "Anticheat.FlyHack.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_ENABLED, "Anticheat.MovingWhileRooted.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD, "Anticheat.MovingWhileRooted.Threshold", 5); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_PENALTY, "Anticheat.MovingWhileRooted.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_ENABLED, "Anticheat.OverpspeedDistance.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_THRESHOLD, "Anticheat.OverpspeedDistance.Threshold", 30); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_PENALTY, "Anticheat.OverpspeedDistance.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TIME_DESYNC_ENABLED, "Anticheat.TimeDesync.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_THRESHOLD, "Anticheat.TimeDesync.Threshold", 10000); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_PENALTY, "Anticheat.TimeDesync.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_ENABLED, "Anticheat.ExploreArea.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_THRESHOLD, "Anticheat.ExploreArea.Threshold", 100); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_PENALTY, "Anticheat.ExploreArea.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_ENABLED, "Anticheat.ExploreHighLevelArea.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_THRESHOLD, "Anticheat.ExploreHighLevelArea.Threshold", 50); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_PENALTY, "Anticheat.ExploreHighLevelArea.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_Z_ENABLED, "Anticheat.OverspeedZ.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_THRESHOLD, "Anticheat.OverspeedZ.Threshold", 3); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_PENALTY, "Anticheat.OverspeedZ.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_NULL_TIME_ENABLED, "Anticheat.NullTime.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_NULL_TIME_THRESHOLD, "Anticheat.NullTime.Threshold", 2); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_NULL_TIME_PENALTY, "Anticheat.NullTime.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_ENABLED, "Anticheat.SkippedHeartbeats.Enable", true); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_THRESHOLD, "Anticheat.SkippedHeartbeats.Threshold", 2); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_PENALTY, "Anticheat.SkippedHeartbeats.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TIME_DESYNC_ENABLED, "Anticheat.TimeDesync.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_THRESHOLD, "Anticheat.TimeDesync.Threshold", 10000); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_PENALTY, "Anticheat.TimeDesync.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_NUM_DESYNCS_ENABLED, "Anticheat.NumDesyncs.Enable", true); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_THRESHOLD, "Anticheat.NumDesyncs.Threshold", 5); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_PENALTY, "Anticheat.NumDesyncs.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_SPEED_HACK_ENABLED, "Anticheat.SpeedHack.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_USE_INTERPOLATION, "Anticheat.SpeedHack.UseInterpolation", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_ENABLED, "Anticheat.OverpspeedDistance.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_THRESHOLD, "Anticheat.OverpspeedDistance.Threshold", 30); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_PENALTY, "Anticheat.OverpspeedDistance.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_Z_ENABLED, "Anticheat.OverspeedZ.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_THRESHOLD, "Anticheat.OverspeedZ.Threshold", 3); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_PENALTY, "Anticheat.OverspeedZ.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_ENABLED, "Anticheat.OverspeedJump.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_REJECT, "Anticheat.OverspeedJump.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_THRESHOLD, "Anticheat.OverspeedJump.Threshold", 3); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_PENALTY, "Anticheat.OverspeedJump.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_ENABLED, "Anticheat.JumpSpeedChange.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_REJECT, "Anticheat.JumpSpeedChange.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_THRESHOLD, "Anticheat.JumpSpeedChange.Threshold", 3); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_PENALTY, "Anticheat.JumpSpeedChange.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED, "Anticheat.MultiJump.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_REJECT, "Anticheat.MultiJump.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD_TICK, "Anticheat.MultiJump.Threshold.Tick", 2); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD_TOTAL, "Anticheat.MultiJump.Threshold.Total", 10); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_PENALTY, "Anticheat.MultiJump.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_UNREACHABLE_ENABLED, "Anticheat.Unreachable.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_THRESHOLD, "Anticheat.Unreachable.Threshold", 40); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_PENALTY, "Anticheat.Unreachable.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_ENABLED, "Anticheat.FlyHack.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_REJECT, "Anticheat.FlyHack.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_THRESHOLD, "Anticheat.FlyHack.Threshold", 3); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_PENALTY, "Anticheat.FlyHack.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_ENABLED, "Anticheat.Teleport.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_REJECT, "Anticheat.Teleport.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_THRESHOLD, "Anticheat.Teleport.Threshold", 3); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_PENALTY, "Anticheat.Teleport.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_BAN_ACCOUNT); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_ENABLED, "Anticheat.TeleportToTransport.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_REJECT, "Anticheat.TeleportToTransport.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_THRESHOLD, "Anticheat.TeleportToTransport.Threshold", 2); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_PENALTY, "Anticheat.TeleportToTransport.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_ENABLED, "Anticheat.FakeTransport.Enable", true); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_THRESHOLD, "Anticheat.FakeTransport.Threshold", 1); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_PENALTY, "Anticheat.FakeTransport.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_ENABLED, "Anticheat.Teleport.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_PENALTY, "Anticheat.Teleport.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_TELEPORT_BACK); - setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_ENABLED, "Anticheat.TeleportToTransport.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_THRESHOLD, "Anticheat.TeleportToTransport.Threshold", 1); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_PENALTY, "Anticheat.TeleportToTransport.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_ENABLED, "Anticheat.WaterWalk.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_REJECT, "Anticheat.WaterWalk.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_THRESHOLD, "Anticheat.WaterWalk.Threshold", 5); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_PENALTY, "Anticheat.WaterWalk.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_SLOW_FALL_ENABLED, "Anticheat.SlowFall.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_THRESHOLD, "Anticheat.SlowFall.Threshold", 10); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_SLOW_FALL_REJECT, "Anticheat.SlowFall.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_THRESHOLD, "Anticheat.SlowFall.Threshold", 5); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_PENALTY, "Anticheat.SlowFall.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_HOVER_ENABLED, "Anticheat.Hover.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_HOVER_REJECT, "Anticheat.Hover.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_HOVER_THRESHOLD, "Anticheat.Hover.Threshold", 5); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_HOVER_PENALTY, "Anticheat.Hover.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FIXED_Z_ENABLED, "Anticheat.FixedZ.Enable", true); - setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_THRESHOLD, "Anticheat.FixedZ.Threshold", 1); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FIXED_Z_REJECT, "Anticheat.FixedZ.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_THRESHOLD, "Anticheat.FixedZ.Threshold", 5); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_PENALTY, "Anticheat.FixedZ.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_ENABLED, "Anticheat.RootMove.Enable", true); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_REJECT, "Anticheat.RootMove.Reject", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD_TICK, "Anticheat.RootMove.Threshold.Tick", 5); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD_TOTAL, "Anticheat.RootMove.Threshold.Total", 30); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_PENALTY, "Anticheat.RootMove.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_ENABLED, "Anticheat.WrongAckData.Enable", true); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_THRESHOLD, "Anticheat.WrongAckData.Threshold", 3); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_PENALTY, "Anticheat.WrongAckData.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_ENABLED, "Anticheat.PendingAckDelay.Enable", true); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_THRESHOLD, "Anticheat.PendingAckDelay.Threshold", 3); setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_PENALTY, "Anticheat.PendingAckDelay.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_ENABLED, "Anticheat.ExploreArea.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_THRESHOLD, "Anticheat.ExploreArea.Threshold", 100); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_PENALTY, "Anticheat.ExploreArea.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_ENABLED, "Anticheat.ExploreHighLevelArea.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_THRESHOLD, "Anticheat.ExploreHighLevelArea.Threshold", 50); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_PENALTY, "Anticheat.ExploreHighLevelArea.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS | CHEAT_ACTION_KICK); + setConfig(CONFIG_BOOL_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_ENABLED, "Anticheat.ForbiddenArea.Enable", true); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_THRESHOLD, "Anticheat.ForbiddenArea.Threshold", 1); + setConfig(CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_PENALTY, "Anticheat.ForbiddenArea.Penalty", CHEAT_ACTION_LOG | CHEAT_ACTION_REPORT_GMS); // Warden Anticheat setConfig(CONFIG_BOOL_AC_WARDEN_WIN_ENABLED, "Warden.WinEnabled", false); diff --git a/src/game/World.h b/src/game/World.h index ad8479dc1..1290469b8 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -269,51 +269,58 @@ enum eConfigUInt32Values CONFIG_UINT32_ACCOUNT_CONCURRENT_AUCTION_LIMIT, CONFIG_UINT32_BANLIST_RELOAD_TIMER, CONFIG_UINT32_AC_MOVEMENT_BAN_DURATION, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_REVERSE_TIME_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_REVERSE_TIME_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_NULL_TIME_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_NULL_TIME_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD_TICK, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_THRESHOLD_TOTAL, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_MULTI_JUMP_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_UNREACHABLE_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FLY_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_TIME_DESYNC_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_OVERSPEED_Z_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_NUM_DESYNCS_PENALTY, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_THRESHOLD, - CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELEPORT_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_WATER_WALK_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_SLOW_FALL_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_HOVER_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_HOVER_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_FIXED_Z_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD_TICK, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_THRESHOLD_TOTAL, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_ROOT_MOVE_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_PENALTY, CONFIG_UINT32_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_THRESHOLD, CONFIG_UINT32_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_PENALTY, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_THRESHOLD, + CONFIG_UINT32_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_PENALTY, CONFIG_UINT32_MOVEMENT_CHANGE_ACK_TIME, CONFIG_UINT32_AC_WARDEN_CLIENT_RESPONSE_DELAY, CONFIG_UINT32_AC_WARDEN_CLIENT_CHECK_HOLDOFF, @@ -525,31 +532,44 @@ enum eConfigBoolValues CONFIG_BOOL_AC_MOVEMENT_PLAYERS_ONLY, CONFIG_BOOL_AC_MOVEMENT_NOTIFY_CHEATERS, CONFIG_BOOL_AC_MOVEMENT_LOG_DATA, - CONFIG_BOOL_AC_MOVEMENT_USE_INTERPOLATION, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_SPEED_HACK_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_UNREACHABLE_ENABLED, CONFIG_BOOL_AC_MOVEMENT_CHEAT_REVERSE_TIME_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_TIME_DESYNC_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_Z_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_NULL_TIME_ENABLED, CONFIG_BOOL_AC_MOVEMENT_CHEAT_SKIPPED_HEARTBEATS_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_TIME_DESYNC_ENABLED, CONFIG_BOOL_AC_MOVEMENT_CHEAT_NUM_DESYNCS_ENABLED, - CONFIG_BOOL_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_SPEED_HACK_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_USE_INTERPOLATION, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_DISTANCE_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_Z_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_OVERSPEED_JUMP_REJECT, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_JUMP_SPEED_CHANGE_REJECT, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_MULTI_JUMP_REJECT, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_UNREACHABLE_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_FLY_REJECT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELEPORT_REJECT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_TELE_TO_TRANSPORT_REJECT, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_FAKE_TRANSPORT_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_WATER_WALK_REJECT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_SLOW_FALL_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_SLOW_FALL_REJECT, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_HOVER_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_HOVER_REJECT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_FIXED_Z_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_FIXED_Z_REJECT, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_ROOT_MOVE_REJECT, CONFIG_BOOL_AC_MOVEMENT_CHEAT_WRONG_ACK_DATA_ENABLED, CONFIG_BOOL_AC_MOVEMENT_CHEAT_PENDING_ACK_DELAY_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_EXPLORE_HIGH_LEVEL_ENABLED, + CONFIG_BOOL_AC_MOVEMENT_CHEAT_FORBIDDEN_AREA_ENABLED, CONFIG_BOOL_AC_WARDEN_WIN_ENABLED, CONFIG_BOOL_AC_WARDEN_OSX_ENABLED, CONFIG_BOOL_VALUE_COUNT diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index df43a87e4..f23404256 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -83,7 +83,7 @@ WorldSession::WorldSession(uint32 id, WorldSocket *sock, AccountTypes sec, time_ m_sessionDbLocaleIndex(sObjectMgr.GetIndexForLocale(locale)), m_latency(0), m_tutorialState(TUTORIALDATA_UNCHANGED), m_warden(nullptr), m_cheatData(nullptr), m_bot(nullptr), m_lastReceivedPacketTime(0), _clientOS(CLIENT_OS_UNKNOWN), _gameBuild(0), _charactersCount(10), _characterMaxLevel(0), _clientHashComputeStep(HASH_NOT_COMPUTED), m_masterSession(nullptr), m_nodeSession(nullptr), - m_masterPlayer(nullptr), m_lastPubChannelMsgTime(NULL) + m_masterPlayer(nullptr), m_lastPubChannelMsgTime(NULL), m_moveRejectTime(0) { if (sock) { diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 5255d420b..7c00643f1 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -899,6 +899,7 @@ class MANGOS_DLL_SPEC WorldSession Player *_player; ObjectGuid _clientMoverGuid; + uint32 m_moveRejectTime; WorldSocket *m_Socket; std::string m_Address; diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in index e3d4a4c86..2862c9ffb 100644 --- a/src/mangosd/mangosd.conf.dist.in +++ b/src/mangosd/mangosd.conf.dist.in @@ -1544,68 +1544,6 @@ Warden.ModuleDir = "warden_modules" # Description: Client time desynchronization allowed when doing movement interpolation. # Default: 0 # -# Anticheat.MultiJump.Enable -# Description: Check for players jumping while still in the air. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.MultiJump.Threshold -# Description: Detections needed to trigger a penalty. -# Default: 2 -# -# Anticheat.MultiJump.Penalty -# Description: Action to take upon failing this check. -# Default: 7 - Log, Report to GM, Kick -# -# Anticheat.SpeedHack.Enable -# Description: Check for players moving too fast. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.SpeedHack.UseInterpolation -# Description: Use movement interpolation when doing speed checks. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.WaterWalk.Enable -# Description: Check for players walking on water without a water walking buff. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.WaterWalk.Threshold -# Description: Detections needed to trigger a penalty. -# Default: 10 -# -# Anticheat.WaterWalk.Penalty -# Description: Action to take upon failing this check. -# Default: 7 - Log, Report to GM, Kick -# -# Anticheat.ForbiddenArea.Enable -# Description: Check for players entering a forbidden area. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.ForbiddenArea.Threshold -# Description: Detections needed to trigger a penalty. -# Default: 1 -# -# Anticheat.ForbiddenArea.Penalty -# Description: Action to take upon failing this check. -# Default: 3 - Log, Report to GM -# -# Anticheat.Unreachable.Enable -# Description: Check for players that are in combat with a creature which can't reach them. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.Unreachable.Threshold -# Description: Detections needed to trigger a penalty. -# Default: 40 -# -# Anticheat.Unreachable.Penalty -# Description: Action to take upon failing this check. -# Default: 3 - Log, Report to GM -# # Anticheat.ReverseTime.Enable # Description: Check for players whose clock went back in time. # Default: 1 - (Enabled) @@ -1619,68 +1557,29 @@ Warden.ModuleDir = "warden_modules" # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # -# Anticheat.OverspeedJump.Enable -# Description: Check for players that are moving too fast while jumping. +# Anticheat.NullTime.Enable +# Description: Check for players sending a null timestamp. # Default: 1 - (Enabled) # 0 - (Disabled) # -# Anticheat.OverspeedJump.Threshold +# Anticheat.NullTime.Threshold # Description: Detections needed to trigger a penalty. -# Default: 1 +# Default: 2 # -# Anticheat.OverspeedJump.Penalty +# Anticheat.NullTime.Penalty # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # -# Anticheat.JumpSpeedChange.Enable -# Description: Check for players that change speed while in the middle of a jump. +# Anticheat.SkippedHeartbeats.Enable +# Description: Check for players missing a heartbeat packet. # Default: 1 - (Enabled) # 0 - (Disabled) # -# Anticheat.JumpSpeedChange.Threshold +# Anticheat.SkippedHeartbeats.Threshold # Description: Detections needed to trigger a penalty. -# Default: 1 +# Default: 2 # -# Anticheat.JumpSpeedChange.Penalty -# Description: Action to take upon failing this check. -# Default: 7 - Log, Report to GM, Kick -# -# Anticheat.FlyHack.Enable -# Description: Check for players that are flying. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.FlyHack.Threshold -# Description: Detections needed to trigger a penalty. -# Default: 3 -# -# Anticheat.FlyHack.Penalty -# Description: Action to take upon failing this check. -# Default: 7 - Log, Report to GM, Kick -# -# Anticheat.MovingWhileRooted.Enable -# Description: Check for players that are moving while rooted. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.MovingWhileRooted.Threshold -# Description: Detections needed to trigger a penalty. -# Default: 5 -# -# Anticheat.MovingWhileRooted.Penalty -# Description: Action to take upon failing this check. -# Default: 7 - Log, Report to GM, Kick -# -# Anticheat.OverpspeedDistance.Enable -# Description: Check for players that claim to have traveled further than possible. -# Default: 1 - (Enabled) -# 0 - (Disabled) -# -# Anticheat.OverpspeedDistance.Threshold -# Description: Yards traveled beyond what we think is possible. -# Default: 30 -# -# Anticheat.OverpspeedDistance.Penalty +# Anticheat.SkippedHeartbeats.Penalty # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # @@ -1710,29 +1609,26 @@ Warden.ModuleDir = "warden_modules" # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # -# Anticheat.ExploreArea.Enable -# Description: Check for players that are exploring low level zones too quickly. +# Anticheat.SpeedHack.Enable +# Description: Check for players moving too fast. # Default: 1 - (Enabled) # 0 - (Disabled) # -# Anticheat.ExploreArea.Threshold -# Description: Count of areas explored this session. -# Default: 100 -# -# Anticheat.ExploreArea.Penalty -# Description: Action to take upon failing this check. -# Default: 7 - Log, Report to GM, Kick -# -# Anticheat.ExploreHighLevelArea.Enable -# Description: Check for players that are exploring high level zones too quickly. +# Anticheat.SpeedHack.UseInterpolation +# Description: Use movement interpolation when doing speed checks. # Default: 1 - (Enabled) # 0 - (Disabled) # -# Anticheat.ExploreHighLevelArea.Threshold -# Description: Count of areas explored this session. -# Default: 50 +# Anticheat.OverpspeedDistance.Enable +# Description: Check for players that claim to have traveled further than possible. +# Default: 1 - (Enabled) +# 0 - (Disabled) # -# Anticheat.ExploreHighLevelArea.Penalty +# Anticheat.OverpspeedDistance.Threshold +# Description: Yards traveled beyond what we think is possible. +# Default: 30 +# +# Anticheat.OverpspeedDistance.Penalty # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # @@ -1749,16 +1645,128 @@ Warden.ModuleDir = "warden_modules" # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # -# Anticheat.SkippedHeartbeats.Enable -# Description: Check for players missing a heartbeat packet. +# Anticheat.OverspeedJump.Enable +# Description: Check for players that are moving too fast while jumping. # Default: 1 - (Enabled) # 0 - (Disabled) # -# Anticheat.SkippedHeartbeats.Threshold +# Anticheat.OverspeedJump.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.OverspeedJump.Threshold +# Description: Detections needed to trigger a penalty. +# Default: 3 +# +# Anticheat.OverspeedJump.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# +# Anticheat.JumpSpeedChange.Enable +# Description: Check for players that change speed while in the middle of a jump. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.JumpSpeedChange.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.JumpSpeedChange.Threshold +# Description: Detections needed to trigger a penalty. +# Default: 3 +# +# Anticheat.JumpSpeedChange.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# +# Anticheat.MultiJump.Enable +# Description: Check for players jumping while still in the air. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.MultiJump.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.MultiJump.Threshold.Tick +# Description: Detections needed to trigger a penalty in one tick. +# Default: 2 +# +# Anticheat.MultiJump.Threshold.Tick +# Description: Detections needed to trigger a penalty total. +# Default: 10 +# +# Anticheat.MultiJump.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# +# Anticheat.Unreachable.Enable +# Description: Check for players that are in combat with a creature which can't reach them. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.Unreachable.Threshold +# Description: Detections needed to trigger a penalty. +# Default: 40 +# +# Anticheat.Unreachable.Penalty +# Description: Action to take upon failing this check. +# Default: 3 - Log, Report to GM +# +# Anticheat.FlyHack.Enable +# Description: Check for players that are flying. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.FlyHack.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.FlyHack.Threshold +# Description: Detections needed to trigger a penalty. +# Default: 3 +# +# Anticheat.FlyHack.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# +# Anticheat.Teleport.Enable +# Description: Check for players teleporting far away from their current position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.Teleport.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.Teleport.Threshold +# Description: Detections needed to trigger a penalty. +# Default: 3 +# +# Anticheat.Teleport.Penalty +# Description: Action to take upon failing this check. +# Default: 11 - Log, Report to GM, Ban +# +# Anticheat.TeleportToTransport.Enable +# Description: Check for players teleporting on a transport. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.TeleportToTransport.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.TeleportToTransport.Threshold # Description: Detections needed to trigger a penalty. # Default: 2 # -# Anticheat.SkippedHeartbeats.Penalty +# Anticheat.TeleportToTransport.Penalty # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # @@ -1775,54 +1783,101 @@ Warden.ModuleDir = "warden_modules" # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # -# Anticheat.Teleport.Enable -# Description: Check for players teleporting far away from their current position. +# Anticheat.WaterWalk.Enable +# Description: Check for players walking on water without a water walking buff. # Default: 1 - (Enabled) # 0 - (Disabled) # -# Anticheat.Teleport.Penalty -# Description: Action to take upon failing this check. -# Default: 35 - Log, Report to GM, Teleport Back -# -# Anticheat.TeleportToTransport.Enable -# Description: Check for players teleporting on a transport. +# Anticheat.WaterWalk.Reject +# Description: Do not accept movement info and teleport to old position. # Default: 1 - (Enabled) # 0 - (Disabled) # -# Anticheat.TeleportToTransport.Threshold +# Anticheat.WaterWalk.Threshold # Description: Detections needed to trigger a penalty. -# Default: 1 +# Default: 5 # -# Anticheat.TeleportToTransport.Penalty +# Anticheat.WaterWalk.Penalty # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # +# # Anticheat.SlowFall.Enable # Description: Check for players slow falling without a slow fall buff. # Default: 1 - (Enabled) # 0 - (Disabled) # +# Anticheat.SlowFall.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# # Anticheat.SlowFall.Threshold # Description: Detections needed to trigger a penalty. -# Default: 10 +# Default: 5 # # Anticheat.SlowFall.Penalty # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # +# Anticheat.Hover.Enable +# Description: Check for players hovering without a hover buff. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.Hover.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.Hover.Threshold +# Description: Detections needed to trigger a penalty. +# Default: 5 +# +# Anticheat.Hover.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# # Anticheat.FixedZ.Enable # Description: Check for players that have a fixed Z axis. # Default: 1 - (Enabled) # 0 - (Disabled) # +# Anticheat.FixedZ.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# # Anticheat.FixedZ.Threshold # Description: Detections needed to trigger a penalty. -# Default: 1 +# Default: 5 # # Anticheat.FixedZ.Penalty # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # +# Anticheat.RootMove.Enable +# Description: Check for players that are moving while rooted. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.RootMove.Reject +# Description: Do not accept movement info and teleport to old position. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.RootMove.Threshold.Tick +# Description: Detections needed to trigger a penalty in one tick. +# Default: 5 +# +# Anticheat.RootMove.Threshold.Total +# Description: Detections needed to trigger a penalty in one tick. +# Default: 30 +# +# Anticheat.RootMove.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# # Anticheat.WrongAckData.Enable # Description: Check for players sending wrong data in an ACK packet. # Default: 1 - (Enabled) @@ -1849,6 +1904,45 @@ Warden.ModuleDir = "warden_modules" # Description: Action to take upon failing this check. # Default: 7 - Log, Report to GM, Kick # +# Anticheat.ExploreArea.Enable +# Description: Check for players that are exploring low level zones too quickly. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.ExploreArea.Threshold +# Description: Count of areas explored this session. +# Default: 100 +# +# Anticheat.ExploreArea.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# +# Anticheat.ExploreHighLevelArea.Enable +# Description: Check for players that are exploring high level zones too quickly. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.ExploreHighLevelArea.Threshold +# Description: Count of areas explored this session. +# Default: 50 +# +# Anticheat.ExploreHighLevelArea.Penalty +# Description: Action to take upon failing this check. +# Default: 7 - Log, Report to GM, Kick +# +# Anticheat.ForbiddenArea.Enable +# Description: Check for players entering a forbidden area. +# Default: 1 - (Enabled) +# 0 - (Disabled) +# +# Anticheat.ForbiddenArea.Threshold +# Description: Detections needed to trigger a penalty. +# Default: 1 +# +# Anticheat.ForbiddenArea.Penalty +# Description: Action to take upon failing this check. +# Default: 3 - Log, Report to GM +# ################################################################################################### Anticheat.Enable = 1 @@ -1857,76 +1951,96 @@ Anticheat.NotifyCheaters = 0 Anticheat.BanDuration = 86400 Anticheat.LogData = 0 Anticheat.MaxAllowedDesync = 0 -Anticheat.MultiJump.Enable = 1 -Anticheat.MultiJump.Threshold = 2 -Anticheat.MultiJump.Penalty = 7 -Anticheat.SpeedHack.Enable = 1 -Anticheat.SpeedHack.UseInterpolation = 1 -Anticheat.WaterWalk.Enable = 1 -Anticheat.WaterWalk.Threshold = 10 -Anticheat.WaterWalk.Penalty = 7 -Anticheat.ForbiddenArea.Enable = 1 -Anticheat.ForbiddenArea.Threshold = 1 -Anticheat.ForbiddenArea.Penalty = 3 -Anticheat.Unreachable.Enable = 1 -Anticheat.Unreachable.Threshold = 40 -Anticheat.Unreachable.Penalty = 3 Anticheat.ReverseTime.Enable = 1 Anticheat.ReverseTime.Threshold = 1 Anticheat.ReverseTime.Penalty = 7 -Anticheat.OverspeedJump.Enable = 1 -Anticheat.OverspeedJump.Threshold = 1 -Anticheat.OverspeedJump.Penalty = 7 -Anticheat.JumpSpeedChange.Enable = 1 -Anticheat.JumpSpeedChange.Threshold = 1 -Anticheat.JumpSpeedChange.Penalty = 7 -Anticheat.FlyHack.Enable = 1 -Anticheat.FlyHack.Threshold = 3 -Anticheat.FlyHack.Penalty = 7 -Anticheat.MovingWhileRooted.Enable = 1 -Anticheat.MovingWhileRooted.Threshold = 5 -Anticheat.MovingWhileRooted.Penalty = 7 -Anticheat.OverpspeedDistance.Enable = 1 -Anticheat.OverpspeedDistance.Threshold = 30 -Anticheat.OverpspeedDistance.Penalty = 7 +Anticheat.NullTime.Enable = 1 +Anticheat.NullTime.Threshold = 2 +Anticheat.NullTime.Penalty = 7 +Anticheat.SkippedHeartbeats.Enable = 1 +Anticheat.SkippedHeartbeats.Threshold = 2 +Anticheat.SkippedHeartbeats.Penalty = 7 Anticheat.TimeDesync.Enable = 1 Anticheat.TimeDesync.Threshold = 10000 Anticheat.TimeDesync.Penalty = 7 Anticheat.NumDesyncs.Enable = 1 Anticheat.NumDesyncs.Threshold = 5 Anticheat.NumDesyncs.Penalty = 7 -Anticheat.ExploreArea.Enable = 1 -Anticheat.ExploreArea.Threshold = 100 -Anticheat.ExploreArea.Penalty = 7 -Anticheat.ExploreHighLevelArea.Enable = 1 -Anticheat.ExploreHighLevelArea.Threshold = 50 -Anticheat.ExploreHighLevelArea.Penalty = 7 +Anticheat.SpeedHack.Enable = 1 +Anticheat.SpeedHack.UseInterpolation = 1 +Anticheat.OverpspeedDistance.Enable = 1 +Anticheat.OverpspeedDistance.Threshold = 30 +Anticheat.OverpspeedDistance.Penalty = 7 Anticheat.OverspeedZ.Enable = 1 Anticheat.OverspeedZ.Threshold = 3 Anticheat.OverspeedZ.Penalty = 7 -Anticheat.SkippedHeartbeats.Enable = 1 -Anticheat.SkippedHeartbeats.Threshold = 2 -Anticheat.SkippedHeartbeats.Penalty = 7 +Anticheat.OverspeedJump.Enable = 1 +Anticheat.OverspeedJump.Reject = 1 +Anticheat.OverspeedJump.Threshold = 3 +Anticheat.OverspeedJump.Penalty = 7 +Anticheat.JumpSpeedChange.Enable = 1 +Anticheat.JumpSpeedChange.Reject = 1 +Anticheat.JumpSpeedChange.Threshold = 3 +Anticheat.JumpSpeedChange.Penalty = 7 +Anticheat.MultiJump.Enable = 1 +Anticheat.MultiJump.Reject = 1 +Anticheat.MultiJump.Threshold.Tick = 2 +Anticheat.MultiJump.Threshold.Total = 10 +Anticheat.MultiJump.Penalty = 7 +Anticheat.Unreachable.Enable = 1 +Anticheat.Unreachable.Threshold = 40 +Anticheat.Unreachable.Penalty = 3 +Anticheat.FlyHack.Enable = 1 +Anticheat.FlyHack.Reject = 1 +Anticheat.FlyHack.Threshold = 3 +Anticheat.FlyHack.Penalty = 7 +Anticheat.Teleport.Enable = 1 +Anticheat.Teleport.Reject = 1 +Anticheat.Teleport.Threshold = 3 +Anticheat.Teleport.Penalty = 11 +Anticheat.TeleportToTransport.Enable = 1 +Anticheat.TeleportToTransport.Reject = 1 +Anticheat.TeleportToTransport.Threshold = 2 +Anticheat.TeleportToTransport.Penalty = 7 Anticheat.FakeTransport.Enable = 1 Anticheat.FakeTransport.Threshold = 1 Anticheat.FakeTransport.Penalty = 7 -Anticheat.Teleport.Enable = 1 -Anticheat.Teleport.Penalty = 35 -Anticheat.TeleportToTransport.Enable = 1 -Anticheat.TeleportToTransport.Threshold = 1 -Anticheat.TeleportToTransport.Penalty = 7 +Anticheat.WaterWalk.Enable = 1 +Anticheat.WaterWalk.Reject = 1 +Anticheat.WaterWalk.Threshold = 5 +Anticheat.WaterWalk.Penalty = 7 Anticheat.SlowFall.Enable = 1 -Anticheat.SlowFall.Threshold = 10 +Anticheat.SlowFall.Reject = 1 +Anticheat.SlowFall.Threshold = 5 Anticheat.SlowFall.Penalty = 7 +Anticheat.Hover.Enable = 1 +Anticheat.Hover.Reject = 1 +Anticheat.Hover.Threshold = 5 +Anticheat.Hover.Penalty = 7 Anticheat.FixedZ.Enable = 1 -Anticheat.FixedZ.Threshold = 1 +Anticheat.FixedZ.Reject = 1 +Anticheat.FixedZ.Threshold = 5 Anticheat.FixedZ.Penalty = 7 +Anticheat.RootMove.Enable = 1 +Anticheat.RootMove.Reject = 1 +Anticheat.RootMove.Threshold.Tick = 5 +Anticheat.RootMove.Threshold.Total = 30 +Anticheat.RootMove.Penalty = 7 Anticheat.WrongAckData.Enable = 1 Anticheat.WrongAckData.Threshold = 3 Anticheat.WrongAckData.Penalty = 7 Anticheat.PendingAckDelay.Enable = 1 Anticheat.PendingAckDelay.Threshold = 3 Anticheat.PendingAckDelay.Penalty = 7 +Anticheat.ExploreArea.Enable = 1 +Anticheat.ExploreArea.Threshold = 100 +Anticheat.ExploreArea.Penalty = 7 +Anticheat.ExploreHighLevelArea.Enable = 1 +Anticheat.ExploreHighLevelArea.Threshold = 50 +Anticheat.ExploreHighLevelArea.Penalty = 7 +Anticheat.ForbiddenArea.Enable = 1 +Anticheat.ForbiddenArea.Threshold = 1 +Anticheat.ForbiddenArea.Penalty = 3 # Time to wait for movement change ack Movement.PendingAckResponseTime = 2000