Merge branch 'master' into Playerbot

2025-05-02 16:50:45 +08:00
parent c304ccee57 b9704d4fa1
commit ce9343d916
138 changed files with 4062 additions and 3707 deletions
@@ -214,6 +214,7 @@ Map::EnterState MapMgr::PlayerCannotEnter(uint32 mapid, Player* player, bool log
        else
        {
            LOG_DEBUG("maps", "Map::PlayerCannotEnter - player '{}' is dead but does not have a corpse!", player->GetName());
+            return Map::CANNOT_ENTER_CORPSE_IN_DIFFERENT_INSTANCE;
        }
    }