From f710fb8d9f1b06fd59be4f1a94d0fd9608f1f823 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Fri, 23 May 2025 12:23:34 -0400 Subject: [PATCH] refactor(Core/Worldstate): Remove redundant worldstate usage. (#22126) Co-authored-by: Jelle Meeus --- src/server/game/Entities/Player/Player.cpp | 6 ------ src/server/game/World/WorldStateDefines.h | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 974a6120e..88a51e0a7 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -8829,13 +8829,7 @@ void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId) battlefield->FillInitialWorldStates(packet); break; } - [[fallthrough]]; default: - packet.Worldstates.reserve(4); - packet.Worldstates.emplace_back(WORLD_STATE_GENERIC_UNK_2, 0); - packet.Worldstates.emplace_back(WORLD_STATE_GENERIC_UNK_1, 0); - packet.Worldstates.emplace_back(WORLD_STATE_GENERIC_UNK_0, 0); - packet.Worldstates.emplace_back(WORLD_STATE_GENERIC_UNK_3, 0); break; } } diff --git a/src/server/game/World/WorldStateDefines.h b/src/server/game/World/WorldStateDefines.h index 5a7a869f5..a1ce0d11e 100644 --- a/src/server/game/World/WorldStateDefines.h +++ b/src/server/game/World/WorldStateDefines.h @@ -596,12 +596,6 @@ enum WorldStateIDs WORLD_STATE_TRIAL_OF_THE_CRUSADER_UI_COUNT = 4389, WORLD_STATE_TRIAL_OF_THE_CRUSADER_UI_SHOW = 4390, - // Unknown - WORLD_STATE_GENERIC_UNK_0 = 2322, - WORLD_STATE_GENERIC_UNK_1 = 2323, - WORLD_STATE_GENERIC_UNK_2 = 2324, - WORLD_STATE_GENERIC_UNK_3 = 2325, - // Stranglethorn Fishing Extravaganza (Are these custom IDs?) WORLD_STATE_STRANGLETHORN_VALE_FISHING_PREV_WIN_TIME = 197, WORLD_STATE_STRANGLETHORN_VALE_FISHING_HAS_WINNER = 198,