[sandbox] Print error message on seccomp sandbox violation

Co-authored-by: cpunch <sethtstubbs@gmail.com>

.github/workflows/check-builds.yaml

@@ -29,7 +29,7 @@ jobs:
           submodules: recursive
           fetch-depth: 0
       - name: Install dependencies
-        run: sudo apt install clang cmake snap libsqlite3-dev -y && sudo snap install powershell --classic
+        run: sudo apt install clang cmake snap -y && sudo snap install powershell --classic
       - name: Check compilation
         run: |
           $versions = "104", "728", "1013"
@@ -113,7 +113,7 @@ jobs:
 
   copy-artifacts:
     if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [windows-build, ubuntu-build]
     env:
       BOT_SSH_KEY: ${{ secrets.BOT_SSH_KEY }}

.github/workflows/push-docker-image.yml

@@ -11,6 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+    strategy:
+      matrix:
+        platforms:
+          - linux/amd64
+          - linux/arm64
     steps:
       - uses: actions/checkout@v4
       - name: Retrieve major version
@@ -26,13 +31,11 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Build and push the Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platforms }}
           push: true
           tags: ${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.ref_name }},${{ secrets.DOCKERHUB_REPOSITORY }}:${{ steps.split.outputs._0 }},${{ secrets.DOCKERHUB_REPOSITORY }}:latest

Dockerfile

@@ -1,5 +1,5 @@
 # build
-FROM debian:stable-slim AS build
+FROM debian:stable-slim as build
 
 WORKDIR /usr/src/app
 
@@ -14,7 +14,7 @@ COPY vendor ./vendor
 COPY .git ./.git
 COPY Makefile CMakeLists.txt version.h.in ./
 
-RUN make nosandbox -j$(nproc)
+RUN make -j8
 
 # prod
 FROM debian:stable-slim
@@ -29,8 +29,4 @@ COPY sql ./sql
 
 CMD ["/bin/fusion"]
 
-EXPOSE 23000/tcp
-EXPOSE 23001/tcp
-EXPOSE 8001/tcp
-
-LABEL Name=openfusion Version=1.6.0
+LABEL Name=openfusion Version=0.0.2

Makefile

@@ -115,7 +115,6 @@ CXXHDR=\
 	src/settings.hpp\
 	src/Transport.hpp\
 	src/TableData.hpp\
-	src/Bucket.hpp\
 	src/Chunking.hpp\
 	src/Buddies.hpp\
 	src/Groups.hpp\

config.ini

@@ -102,8 +102,5 @@ eventmode=0
 enabled=false
 # the port to listen for connections on
 port=8003
-# The local IP to listen on.
-# Do not change this unless you know what you're doing.
-listenip=127.0.0.1
 # how often the listeners should be updated (in milliseconds)
 interval=5000

docker-compose.yml

@@ -1,9 +1,11 @@
+version: '3.4'
+
 services:
   openfusion:
+    image: openfusion
     build:
       context: .
       dockerfile: ./Dockerfile
-    image: openfusion/openfusion:latest
     volumes:
       - ./config.ini:/usr/src/app/config.ini
       - ./database.db:/usr/src/app/database.db

src/Bucket.hpp

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <array>
-#include <optional>
-
-template<class T, size_t N>
-class Bucket {
-    std::array<T, N> buf;
-    size_t sz;
-public:
-    Bucket() {
-        sz = 0;
-    }
-
-    void add(const T& item) {
-        if (sz < N) {
-            buf[sz++] = item;
-        }
-    }
-
-    std::optional<T> get(size_t idx) const {
-        if (idx < sz) {
-            return buf[idx];
-        }
-        return std::nullopt;
-    }
-
-    size_t size() const {
-        return sz;
-    }
-
-    bool isFull() const {
-        return sz == N;
-    }
-
-    void clear() {
-        sz = 0;
-    }
-};

src/Chunking.cpp

@@ -1,9 +1,7 @@
 #include "Chunking.hpp"
 
-#include "Player.hpp"
 #include "MobAI.hpp"
 #include "NPCManager.hpp"
-#include "Bucket.hpp"
 
 #include <assert.h>
 
@@ -13,11 +11,6 @@ using namespace Chunking;
  * The initial chunkPos value before a player is placed into the world.
  */
 const ChunkPos Chunking::INVALID_CHUNK = {};
-constexpr size_t MAX_PC_PER_AROUND = (CN_PACKET_BUFFER_SIZE - sizeof(int32_t)) / sizeof(sPCAppearanceData);
-constexpr size_t MAX_NPC_PER_AROUND = (CN_PACKET_BUFFER_SIZE - sizeof(int32_t)) / sizeof(sNPCAppearanceData);
-constexpr size_t MAX_SHINY_PER_AROUND = (CN_PACKET_BUFFER_SIZE - sizeof(int32_t)) / sizeof(sShinyAppearanceData);
-constexpr size_t MAX_TRANSPORTATION_PER_AROUND = (CN_PACKET_BUFFER_SIZE - sizeof(int32_t)) / sizeof(sTransportationAppearanceData);
-constexpr size_t MAX_IDS_PER_AROUND_DEL = (CN_PACKET_BUFFER_SIZE - sizeof(int32_t)) / sizeof(int32_t);
 
 std::map<ChunkPos, Chunk*> Chunking::chunks;
 
@@ -82,82 +75,11 @@ void Chunking::untrackEntity(ChunkPos chunkPos, const EntityRef ref) {
         deleteChunk(chunkPos);
 }
 
-template<class T, size_t N>
-static void sendAroundPacket(const EntityRef recipient, std::vector<Bucket<T, N>>& buckets, uint32_t packetId) {
-    assert(recipient.kind == EntityKind::PLAYER);
-
-    uint8_t pktBuf[CN_PACKET_BUFFER_SIZE];
-    for (const auto& bucket : buckets) {
-        memset(pktBuf, 0, CN_PACKET_BUFFER_SIZE);
-        int count = bucket.size();
-        *((int32_t*)pktBuf) = count;
-        T* data = (T*)(pktBuf + sizeof(int32_t));
-        for (size_t i = 0; i < count; i++) {
-            data[i] = bucket.get(i).value();
-        }
-        recipient.sock->sendPacket(pktBuf, packetId, sizeof(int32_t) + (count * sizeof(T)));
-    }
-}
-
-template<size_t N>
-static void sendAroundDelPacket(const EntityRef recipient, std::vector<Bucket<int32_t, N>>& buckets, bool isTransportation, uint32_t packetId) {
-    assert(recipient.kind == EntityKind::PLAYER);
-
-    uint8_t pktBuf[CN_PACKET_BUFFER_SIZE];
-    for (const auto& bucket : buckets) {
-        memset(pktBuf, 0, CN_PACKET_BUFFER_SIZE);
-        int count = bucket.size();
-        assert(count <= N);
-
-        size_t baseSize;
-        if (isTransportation) {
-            sP_FE2CL_AROUND_DEL_TRANSPORTATION* pkt = (sP_FE2CL_AROUND_DEL_TRANSPORTATION*)pktBuf;
-            pkt->eTT = 3;
-            pkt->iCnt = count;
-            baseSize = sizeof(sP_FE2CL_AROUND_DEL_TRANSPORTATION);
-        } else {
-            *((int32_t*)pktBuf) = count;
-            baseSize = sizeof(int32_t);
-        }
-        int32_t* ids = (int32_t*)(pktBuf + baseSize);
-
-        for (size_t i = 0; i < count; i++) {
-            ids[i] = bucket.get(i).value();
-        }
-        recipient.sock->sendPacket(pktBuf, packetId, baseSize + (count * sizeof(int32_t)));
-    }
-}
-
-template<class T, size_t N>
-static void bufferAppearanceData(std::vector<Bucket<T, N>>& buckets, const T& data) {
-    if (buckets.empty())
-        buckets.push_back(Bucket<T, N>());
-    Bucket<T, N>& bucket = buckets[buckets.size() - 1];
-    assert(!bucket.isFull());
-    bucket.add(data);
-    if (bucket.isFull())
-        buckets.push_back(Bucket<T, N>());
-}
-
-template<size_t N>
-static void bufferIdForDisappearance(std::vector<Bucket<int32_t, N>>& buckets, int32_t id) {
-    if (buckets.empty())
-        buckets.push_back(Bucket<int32_t, N>());
-    Bucket<int32_t, N>& bucket = buckets[buckets.size() - 1];
-    assert(!bucket.isFull());
-    bucket.add(id);
-    if (bucket.isFull())
-        buckets.push_back(Bucket<int32_t, N>());
-}
-
 void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
     Entity *ent = ref.getEntity();
     bool alive = ent->isExtant();
 
-    std::vector<Bucket<sPCAppearanceData, MAX_PC_PER_AROUND>> pcAppearances;
-    std::vector<Bucket<sNPCAppearanceData, MAX_NPC_PER_AROUND>> npcAppearances;
-    std::vector<Bucket<sShinyAppearanceData, MAX_SHINY_PER_AROUND>> shinyAppearances;
-    std::vector<Bucket<sTransportationAppearanceData, MAX_TRANSPORTATION_PER_AROUND>> transportationAppearances;
+    // TODO: maybe optimize this, potentially using AROUND packets?
     for (Chunk *chunk : chnks) {
         for (const EntityRef otherRef : chunk->entities) {
             // skip oneself
@@ -173,39 +95,7 @@ void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
 
             // notify this *player* of the existence of all visible Entities
             if (ref.kind == EntityKind::PLAYER && other->isExtant()) {
-                sPCAppearanceData pcData;
-                sNPCAppearanceData npcData;
-                sShinyAppearanceData eggData;
-                sTransportationAppearanceData busData;
-                switch(otherRef.kind)
-                {
-                case EntityKind::PLAYER:
-                    pcData = dynamic_cast<Player*>(other)->getAppearanceData();
-                    bufferAppearanceData(pcAppearances, pcData);
-                    break;
-                case EntityKind::SIMPLE_NPC:
-                    npcData = dynamic_cast<BaseNPC*>(other)->getAppearanceData();
-                    bufferAppearanceData(npcAppearances, npcData);
-                    break;
-                case EntityKind::COMBAT_NPC:
-                    npcData = dynamic_cast<CombatNPC*>(other)->getAppearanceData();
-                    bufferAppearanceData(npcAppearances, npcData);
-                    break;
-                case EntityKind::MOB:
-                    npcData = dynamic_cast<Mob*>(other)->getAppearanceData();
-                    bufferAppearanceData(npcAppearances, npcData);
-                    break;
-                case EntityKind::EGG:
-                    eggData = dynamic_cast<Egg*>(other)->getShinyAppearanceData();
-                    bufferAppearanceData(shinyAppearances, eggData);
-                    break;
-                case EntityKind::BUS:
-                    busData = dynamic_cast<Bus*>(other)->getTransportationAppearanceData();
-                    bufferAppearanceData(transportationAppearances, busData);
-                    break;
-                default:
-                    break;
-                }
+                other->enterIntoViewOf(ref.sock);
             }
 
             // for mobs, increment playersInView
@@ -215,28 +105,13 @@ void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
                 ((Mob*)other)->playersInView++;
         }
     }
-
-    if (ref.kind != EntityKind::PLAYER)
-        return; // nothing to send
-
-    if (!pcAppearances.empty())
-        sendAroundPacket(ref, pcAppearances, P_FE2CL_PC_AROUND);
-    if (!npcAppearances.empty())
-        sendAroundPacket(ref, npcAppearances, P_FE2CL_NPC_AROUND);
-    if (!shinyAppearances.empty())
-        sendAroundPacket(ref, shinyAppearances, P_FE2CL_SHINY_AROUND);
-    if (!transportationAppearances.empty())
-        sendAroundPacket(ref, transportationAppearances, P_FE2CL_TRANSPORTATION_AROUND);
 }
 
 void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef ref) {
     Entity *ent = ref.getEntity();
     bool alive = ent->isExtant();
 
-    std::vector<Bucket<int32_t, MAX_IDS_PER_AROUND_DEL>> pcDisappearances;
-    std::vector<Bucket<int32_t, MAX_IDS_PER_AROUND_DEL>> npcDisappearances;
-    std::vector<Bucket<int32_t, MAX_IDS_PER_AROUND_DEL>> shinyDisappearances;
-    std::vector<Bucket<int32_t, MAX_IDS_PER_AROUND_DEL - 1>> transportationDisappearances;
+    // TODO: same as above
     for (Chunk *chunk : chnks) {
         for (const EntityRef otherRef : chunk->entities) {
             // skip oneself
@@ -252,30 +127,7 @@ void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef re
 
             // notify this *player* of the departure of all visible Entities
             if (ref.kind == EntityKind::PLAYER && other->isExtant()) {
-                int32_t id;
-                switch(otherRef.kind)
-                {
-                case EntityKind::PLAYER:
-                    id = dynamic_cast<Player*>(other)->iID;
-                    bufferIdForDisappearance(pcDisappearances, id);
-                    break;
-                case EntityKind::SIMPLE_NPC:
-                case EntityKind::COMBAT_NPC:
-                case EntityKind::MOB:
-                    id = dynamic_cast<BaseNPC*>(other)->id;
-                    bufferIdForDisappearance(npcDisappearances, id);
-                    break;
-                case EntityKind::EGG:
-                    id = dynamic_cast<Egg*>(other)->id;
-                    bufferIdForDisappearance(shinyDisappearances, id);
-                    break;
-                case EntityKind::BUS:
-                    id = dynamic_cast<Bus*>(other)->id;
-                    bufferIdForDisappearance(transportationDisappearances, id);
-                    break;
-                default:
-                    break;
-                }
+                other->disappearFromViewOf(ref.sock);
             }
 
             // for mobs, decrement playersInView
@@ -285,18 +137,6 @@ void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef re
                 ((Mob*)other)->playersInView--;
         }
     }
-
-    if (ref.kind != EntityKind::PLAYER)
-        return; // nothing to send
-
-    if (!pcDisappearances.empty())
-        sendAroundDelPacket(ref, pcDisappearances, false, P_FE2CL_AROUND_DEL_PC);
-    if (!npcDisappearances.empty())
-        sendAroundDelPacket(ref, npcDisappearances, false, P_FE2CL_AROUND_DEL_NPC);
-    if (!shinyDisappearances.empty())
-        sendAroundDelPacket(ref, shinyDisappearances, false, P_FE2CL_AROUND_DEL_SHINY);
-    if (!transportationDisappearances.empty())
-        sendAroundDelPacket(ref, transportationDisappearances, true, P_FE2CL_AROUND_DEL_TRANSPORTATION);
 }
 
 static void emptyChunk(ChunkPos chunkPos) {

src/Eggs.cpp

@@ -126,6 +126,15 @@ static void eggStep(CNServer* serv, time_t currTime) {
 
 }
 
+void Eggs::npcDataToEggData(int x, int y, int z, sNPCAppearanceData* npc, sShinyAppearanceData* egg) {
+    egg->iX = x;
+    egg->iY = y;
+    egg->iZ = z;
+    // client doesn't care about egg->iMapNum
+    egg->iShinyType = npc->iNPCType;
+    egg->iShiny_ID = npc->iNPC_ID;
+}
+
 static void eggPickup(CNSocket* sock, CNPacketData* data) {
     auto pickup = (sP_CL2FE_REQ_SHINY_PICKUP*)data->buf;
     Player* plr = PlayerManager::getPlayer(sock);

src/Eggs.hpp

@@ -15,4 +15,5 @@ namespace Eggs {
     void init();
 
     void eggBuffPlayer(CNSocket* sock, int skillId, int eggId, int duration);
+    void npcDataToEggData(int x, int y, int z, sNPCAppearanceData* npc, sShinyAppearanceData* egg);
 }

src/Entities.cpp

@@ -70,7 +70,11 @@ void Bus::enterIntoViewOf(CNSocket *sock) {
     INITSTRUCT(sP_FE2CL_TRANSPORTATION_ENTER, pkt);
 
     // TODO: Potentially decouple this from BaseNPC?
-    pkt.AppearanceData = getTransportationAppearanceData();
+    pkt.AppearanceData = {
+        3, id, type,
+        x, y, z
+    };
+
     sock->sendPacket(pkt, P_FE2CL_TRANSPORTATION_ENTER);
 }
 
@@ -78,22 +82,12 @@ void Egg::enterIntoViewOf(CNSocket *sock) {
     INITSTRUCT(sP_FE2CL_SHINY_ENTER, pkt);
 
     // TODO: Potentially decouple this from BaseNPC?
-    pkt.ShinyAppearanceData = getShinyAppearanceData();
-    sock->sendPacket(pkt, P_FE2CL_SHINY_ENTER);
-}
-
-sTransportationAppearanceData Bus::getTransportationAppearanceData() {
-    return sTransportationAppearanceData {
-        3, id, type,
-        x, y, z
-    };
-}
-
-sShinyAppearanceData Egg::getShinyAppearanceData() {
-    return sShinyAppearanceData {
+    pkt.ShinyAppearanceData = {
         id, type, 0, // client doesn't care about map num
         x, y, z
     };
+
+    sock->sendPacket(pkt, P_FE2CL_SHINY_ENTER);
 }
 
 sNano* Player::getActiveNano() {

src/Entities.hpp

@@ -161,8 +161,6 @@ struct Egg : public BaseNPC {
 
     virtual void enterIntoViewOf(CNSocket *sock) override;
     virtual void disappearFromViewOf(CNSocket *sock) override;
-
-    sShinyAppearanceData getShinyAppearanceData();
 };
 
 struct Bus : public BaseNPC {
@@ -174,6 +172,4 @@ struct Bus : public BaseNPC {
 
     virtual void enterIntoViewOf(CNSocket *sock) override;
     virtual void disappearFromViewOf(CNSocket *sock) override;
-
-    sTransportationAppearanceData getTransportationAppearanceData();
 };

src/MobAI.cpp

@@ -478,14 +478,6 @@ void MobAI::deadStep(CombatNPC* npc, time_t currTime) {
     if (self->groupLeader == self->id)
         roamingStep(self, currTime);
 
-    /*
-     * If the mob hasn't fully despanwed yet, don't try to respawn it. This protects
-     * against the edge case where mobs with a very short regenTime would try to respawn
-     * before they've faded away; and would respawn even if they were meant to be removed.
-     */
-    if (!self->despawned)
-        return;
-
     if (self->killedTime != 0 && currTime - self->killedTime < self->regenTime * 100)
         return;
 

src/Transport.cpp

@@ -388,21 +388,8 @@ NPCPath* Transport::findApplicablePath(int32_t id, int32_t type, int taskID) {
 
 void Transport::constructPathNPC(int32_t id, NPCPath* path) {
     BaseNPC* npc = NPCManager::NPCs[id];
-
-    if (npc->kind == EntityKind::MOB) {
-        auto mob = (Mob*)npc;
-        mob->staticPath = true;
-
-        Vec3 firstPoint = path->points.front();
-
-        // Ensure that the first point coincides with the mob's spawn point.
-        if (mob->spawnX != firstPoint.x || mob->spawnY != firstPoint.y) {
-            std::cout << "[FATAL] The first point of the route for mob " << mob->id << " (type " << mob->type
-                << ") does not correspond with its spawn point." << std::endl;
-            exit(1);
-        }
-    }
-
+    if (npc->kind == EntityKind::MOB)
+        ((Mob*)(npc))->staticPath = true;
     npc->loopingPath = path->isLoop;
 
     // Interpolate

src/core/CNProtocol.cpp

@@ -428,7 +428,7 @@ void CNServer::removePollFD(int fd) {
 }
 
 void CNServer::start() {
-    std::cout << "Starting " << serverType << " server at *:" << port << std::endl;
+    std::cout << "Starting server at *:" << port << std::endl;
     while (active) {
         // the timeout is to ensure shard timers are ticking
         int n = poll(fds.data(), fds.size(), 50);

src/core/Defines.hpp

@@ -1,8 +1,6 @@
 /* enum definitions from the client */
 #pragma once
 
-#include "core/CNStructs.hpp"
-
 // floats
 const float VALUE_BATTERY_EMPTY_PENALTY = 0.5f;
 const float CN_EP_RANK_1 = 0.8f;
@@ -412,13 +410,7 @@ enum {
     SEND_ANYCAST_NEW = 3,
     SEND_BROADCAST = 4,
 
-#if PROTOCOL_VERSION == 728
-    CN_PACKET_BUFFER_SIZE = 8192,
-#elif PROTOCOL_VERSION == 1013
-    CN_PACKET_BUFFER_SIZE = 8192,
-#else
     CN_PACKET_BUFFER_SIZE = 4096,
-#endif
 
     P_CL2LS_REQ_LOGIN = 0x12000001,		// 301989889
     P_CL2LS_REQ_CHECK_CHAR_NAME = 0x12000002,		// 301989890

src/core/Packets.cpp

@@ -235,7 +235,7 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
     PACKET(P_FE2CL_REP_PC_EXIT_FAIL),
     PACKET(P_FE2CL_REP_PC_EXIT_SUCC),
     PACKET(P_FE2CL_PC_EXIT),
-    VAR_PACKET(P_FE2CL_PC_AROUND, iPCCnt, sPCAppearanceData),
+    PACKET(P_FE2CL_PC_AROUND),
     PACKET(P_FE2CL_PC_MOVE),
     PACKET(P_FE2CL_PC_STOP),
     PACKET(P_FE2CL_PC_JUMP),
@@ -243,9 +243,9 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
     PACKET(P_FE2CL_NPC_EXIT),
     PACKET(P_FE2CL_NPC_MOVE),
     PACKET(P_FE2CL_NPC_NEW),
-    VAR_PACKET(P_FE2CL_NPC_AROUND, iNPCCnt, sNPCAppearanceData),
-    VAR_PACKET(P_FE2CL_AROUND_DEL_PC, iPCCnt, int32_t),
-    VAR_PACKET(P_FE2CL_AROUND_DEL_NPC, iNPCCnt, int32_t),
+    PACKET(P_FE2CL_NPC_AROUND),
+    PACKET(P_FE2CL_AROUND_DEL_PC),
+    PACKET(P_FE2CL_AROUND_DEL_NPC),
     PACKET(P_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC),
     PACKET(P_FE2CL_REP_SEND_FREECHAT_MESSAGE_FAIL),
     VAR_PACKET(P_FE2CL_PC_ATTACK_NPCs_SUCC, iNPCCnt, sAttackResult),
@@ -387,8 +387,8 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
     PACKET(P_FE2CL_TRANSPORTATION_EXIT),
     PACKET(P_FE2CL_TRANSPORTATION_MOVE),
     PACKET(P_FE2CL_TRANSPORTATION_NEW),
-    VAR_PACKET(P_FE2CL_TRANSPORTATION_AROUND, iCnt, sTransportationAppearanceData),
-    VAR_PACKET(P_FE2CL_AROUND_DEL_TRANSPORTATION, iCnt, int32_t),
+    PACKET(P_FE2CL_TRANSPORTATION_AROUND),
+    PACKET(P_FE2CL_AROUND_DEL_TRANSPORTATION),
     PACKET(P_FE2CL_REP_EP_RANK_LIST),
     PACKET(P_FE2CL_REP_EP_RANK_DETAIL),
     PACKET(P_FE2CL_REP_EP_RANK_PC_INFO),
@@ -404,8 +404,8 @@ std::map<uint32_t, PacketDesc> Packets::packets = {
     PACKET(P_FE2CL_SHINY_ENTER),
     PACKET(P_FE2CL_SHINY_EXIT),
     PACKET(P_FE2CL_SHINY_NEW),
-    VAR_PACKET(P_FE2CL_SHINY_AROUND, iShinyCnt, sShinyAppearanceData),
-    VAR_PACKET(P_FE2CL_AROUND_DEL_SHINY, iShinyCnt, int32_t),
+    PACKET(P_FE2CL_SHINY_AROUND),
+    PACKET(P_FE2CL_AROUND_DEL_SHINY),
     PACKET(P_FE2CL_REP_SHINY_PICKUP_FAIL),
     PACKET(P_FE2CL_REP_SHINY_PICKUP_SUCC),
     PACKET(P_FE2CL_PC_MOVETRANSPORTATION),

src/sandbox/seccomp.cpp

@@ -391,7 +391,7 @@ static bool landlock_detect() {
         exit(1);
     }
 
-    std::cout << "[INFO] Detected Landlock ABI version: " << abi << std::endl;
+    std::cout << "[INFO] Landlock ABI version: " << abi << std::endl;
 
     switch (abi) {
     case 1:

src/servers/Monitor.cpp

@@ -180,14 +180,9 @@ SOCKET Monitor::init() {
     }
 
     address.sin_family = AF_INET;
+    address.sin_addr.s_addr = INADDR_ANY;
     address.sin_port = htons(settings::MONITORPORT);
 
-    if (!inet_pton(AF_INET, settings::MONITORLISTENIP.c_str(), &address.sin_addr)) {
-        std::cout << "Failed to set monitor listen address" << std::endl;
-        printSocketError("inet_pton");
-        exit(1);
-    }
-
     if (SOCKETERROR(bind(listener, (struct sockaddr*)&address, sizeof(address)))) {
         std::cout << "Failed to bind to monitor port" << std::endl;
         printSocketError("bind");
@@ -211,7 +206,7 @@ SOCKET Monitor::init() {
         exit(EXIT_FAILURE);
     }
 
-    std::cout << "Monitor listening on " << settings::MONITORLISTENIP << ":" << settings::MONITORPORT << std::endl;
+    std::cout << "Monitor listening on *:" << settings::MONITORPORT << std::endl;
 
     REGISTER_SHARD_TIMER(tick, settings::MONITORINTERVAL);
 

src/settings.cpp

@@ -64,7 +64,6 @@ bool settings::DISABLEFIRSTUSEFLAG = true;
 // monitor settings
 bool settings::MONITORENABLED = false;
 int settings::MONITORPORT = 8003;
-std::string settings::MONITORLISTENIP = "127.0.0.1";
 int settings::MONITORINTERVAL = 5000;
 
 // event mode settings
@@ -122,6 +121,5 @@ void settings::init() {
     IZRACESCORECAPPED = reader.GetBoolean("shard", "izracescorecapped", IZRACESCORECAPPED);
     MONITORENABLED = reader.GetBoolean("monitor", "enabled", MONITORENABLED);
     MONITORPORT = reader.GetInteger("monitor", "port", MONITORPORT);
-    MONITORLISTENIP = reader.Get("monitor", "listenip", MONITORLISTENIP);
     MONITORINTERVAL = reader.GetInteger("monitor", "interval", MONITORINTERVAL);
 }

src/settings.hpp

@@ -38,7 +38,6 @@ namespace settings {
     extern int EVENTMODE;
     extern bool MONITORENABLED;
     extern int MONITORPORT;
-    extern std::string MONITORLISTENIP;
     extern int MONITORINTERVAL;
     extern bool DISABLEFIRSTUSEFLAG;
     extern bool IZRACESCORECAPPED;