diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4f0207808..1d68b17642 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,7 +161,7 @@ jobs: # fail-fast: false # matrix: # eluna: [ON, OFF] -# patch: [zero, one, two] +# patch: [zero, one, two, three] # runs-on: ubuntu-20.04 # steps: # - uses: actions/checkout@v4 diff --git a/README.md b/README.md index 6831e2d19d..efe3c087e6 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,8 @@ Core sources and forks with required modifications for Eluna: [Official MaNGOS Zero with Eluna](https://github.com/mangoszero/server) [Official MaNGOS One with Eluna](https://github.com/mangosone/server) -[Official MaNGOS Two with Eluna](https://github.com/mangostwo/server) +[Official MaNGOS Two with Eluna](https://github.com/mangostwo/server) +[Official MaNGOS Three with Eluna](https://github.com/mangosthree/server) [Eluna cMaNGOS Classic](https://github.com/Niam5/Eluna-CMaNGOS-Classic) - maintained by [Niam5](https://github.com/Niam5) [Eluna cMaNGOS TBC](https://github.com/Niam5/Eluna-CMaNGOS-TBC) - maintained by [Niam5](https://github.com/Niam5) diff --git a/methods/Mangos/GlobalMethods.h b/methods/Mangos/GlobalMethods.h index 6271b66ba3..c9ec4d0360 100644 --- a/methods/Mangos/GlobalMethods.h +++ b/methods/Mangos/GlobalMethods.h @@ -1756,7 +1756,12 @@ namespace LuaGlobalFunctions auto const itemlist = items->m_items; for (auto itr = itemlist.begin(); itr != itemlist.end(); ++itr) + +#if defined(MISTS) || defined (CATA) + eObjectMgr->RemoveVendorItem(entry, (*itr)->item, 1); +#else eObjectMgr->RemoveVendorItem(entry, (*itr)->item); +#endif return 0; } diff --git a/methods/Mangos/UnitMethods.h b/methods/Mangos/UnitMethods.h index 2485d17bb7..d6b1f6778a 100644 --- a/methods/Mangos/UnitMethods.h +++ b/methods/Mangos/UnitMethods.h @@ -1935,7 +1935,7 @@ namespace LuaUnit float maxHeight = E->CHECKVAL(6); uint32 id = E->CHECKVAL(7, 0); -#if WOTLK +#if defined(WOTLK) || defined(CATA) unit->GetMotionMaster()->MoveJump(x, y, z, zSpeed, maxHeight, id); #else Position pos(x, y, z); @@ -2178,7 +2178,11 @@ namespace LuaUnit for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i) { +#if defined (CATA) + uint8 eff = SpellEffectIndex(i); +#else uint8 eff = spellEntry->Effect[i]; +#endif if (eff >= TOTAL_SPELL_EFFECTS) continue;