Merge branch 'master' into Playerbot

2026-02-02 18:43:48 +00:00 · 2024-12-05 00:08:25 +08:00
parent ba56317506 47580c0fab
commit 889b509313
121 changed files with 4818 additions and 1413 deletions
--- a/src/common/Collision/Models/ModelInstance.cpp
+++ b/src/common/Collision/Models/ModelInstance.cpp
@@ -150,8 +150,7 @@ namespace VMAP
        if (info.hitModel->GetLiquidLevel(pModel, zDist))
        {
            // calculate world height (zDist in model coords):
-            // assume WMO not tilted (wouldn't make much sense anyway)
-            liqHeight = zDist * iScale + iPos.z;
+            liqHeight = (Vector3(pModel.x, pModel.y, zDist) * iInvRot * iScale + iPos).z;
            return true;
        }
        return false;