From 1560be33b6dbc6d8071d350b988d331e6d4f5b37 Mon Sep 17 00:00:00 2001 From: andybe <3150627+andybe@users.noreply.github.com> Date: Tue, 18 May 2021 21:43:32 +0200 Subject: [PATCH 1/2] CMakelist in sync with release point (#156) Co-authored-by: AndyBe --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f70deb91..214cfa96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ message( message("") #==================================================================================# -project(MaNGOS VERSION 0.21.0) +project(MaNGOS VERSION 0.22.0) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Default install directory" FORCE) From 201bded3ba6934552a1c517e7f1edd79fea290d5 Mon Sep 17 00:00:00 2001 From: Tristan 'Natrist' Cormier Date: Tue, 18 May 2021 15:47:06 -0400 Subject: [PATCH 2/2] Fixed a bug that caused the server to crash when removing a player's.. (#152) .. insigna, as a Rogue. --- src/game/WorldHandlers/LootHandler.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/game/WorldHandlers/LootHandler.cpp b/src/game/WorldHandlers/LootHandler.cpp index e66f0f38..d6a95b2b 100644 --- a/src/game/WorldHandlers/LootHandler.cpp +++ b/src/game/WorldHandlers/LootHandler.cpp @@ -255,15 +255,26 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket& /*recv_data*/) break; } - case HIGHGUID_CORPSE: // remove insignia ONLY in BG + /* HACK: Due to the spaghetti code below, */ + /* we have a special case here for the looting of player corpses in battlegrounds. */ + case HIGHGUID_CORPSE: { Corpse* bones = _player->GetMap()->GetCorpse(guid); if (bones && bones->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) { pLoot = &bones->loot; - } + pLoot->NotifyMoneyRemoved(); + player->ModifyMoney(pLoot->gold); + // Used by Eluna + #ifdef ENABLE_ELUNA + sEluna->OnLootMoney(player, pLoot->gold); + #endif /* ENABLE_ELUNA */ + + pLoot->gold = 0; + return; + } break; } case HIGHGUID_ITEM: