Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
6616009e92 | |||
1ada609020 | |||
0101618d89 |
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:latest as build
|
FROM ubuntu:22.04 as build
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Update the system and install various dependencies
|
# Update the system and install various dependencies
|
||||||
@ -21,7 +21,7 @@ RUN mkdir build/
|
|||||||
RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
|
RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
|
||||||
RUN cd build && make -j $(nproc)
|
RUN cd build && make -j $(nproc)
|
||||||
|
|
||||||
FROM ubuntu:latest as app
|
FROM ubuntu:22.04 as app
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean
|
RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean
|
||||||
|
@ -815,6 +815,11 @@ CLand * CManager::FindLandByGuild(DWORD GID)
|
|||||||
|
|
||||||
bool CManager::LoadObject(TObject * pTable, bool isBoot) // from DB
|
bool CManager::LoadObject(TObject * pTable, bool isBoot) // from DB
|
||||||
{
|
{
|
||||||
|
// Skip loading if the target map is not available on this core
|
||||||
|
// Source: https://metin2.dev/topic/23614-solving-a-very-old-problem-what-most-people-ignore/#comment-163073
|
||||||
|
if (!map_allow_find(pTable->lMapIndex))
|
||||||
|
return false;
|
||||||
|
|
||||||
CLand * pkLand = FindLand(pTable->dwLandID);
|
CLand * pkLand = FindLand(pTable->dwLandID);
|
||||||
|
|
||||||
if (!pkLand)
|
if (!pkLand)
|
||||||
|
Reference in New Issue
Block a user