diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000..749ab62c5 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,16 @@ +--- +kind: pipeline +type: docker +name: EQEmulator Server Linux CI + +# Limits how many of these builds can run on the drone runner at a time, this isn't about cores +concurrency: + limit: 1 + +steps: + - name: server-build + # Source build script https://github.com/Akkadius/akk-stack/blob/master/containers/eqemu-server/Dockerfile#L20 + image: akkadius/eqemu-server:latest + commands: + - sudo chown eqemu:eqemu /drone/src/ * -R + - git submodule init && git submodule update && mkdir -p build && cd build && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_BOTS=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' .. && make -j$((`nproc`-4)) \ No newline at end of file diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp index 7acebb219..34d2daba5 100644 --- a/zone/mob_ai.cpp +++ b/zone/mob_ai.cpp @@ -1632,14 +1632,16 @@ void NPC::AI_DoMovement() { } else { // Mob was in water, make sure new spot is in water also roambox_destination_z = m_Position.z; - auto position = glm::vec3( roambox_destination_x, - roambox_destination_y, - m_Position.z + 15); + auto position = glm::vec3( + roambox_destination_x, + roambox_destination_y, + m_Position.z + 15 + ); if (!zone->watermap->InLiquid(position)) { - roambox_destination_x = m_SpawnPoint.x; - roambox_destination_y = m_SpawnPoint.y; - roambox_destination_z = m_SpawnPoint.z; - } + roambox_destination_x = m_SpawnPoint.x; + roambox_destination_y = m_SpawnPoint.y; + roambox_destination_z = m_SpawnPoint.z; + } } PathfinderOptions opts;