Merge d8b63a043e into c636c538eb

Fix conflicts
Clear player buffs on death if not revived
2025-10-14 01:50:05 +00:00 · 2023-09-02 20:50:38 -07:00 · 2023-08-23 19:22:38 -07:00 · 2023-08-20 18:16:14 -07:00 · 2023-08-20 18:07:23 -07:00 · 2023-08-19 16:19:36 -07:00
71 changed files with 8209 additions and 8748 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1 @@
+version.h
--- a/.github/workflows/check-builds.yaml
+++ b/.github/workflows/check-builds.yaml
@@ -9,13 +9,12 @@ on:
        - CMakeLists.txt
        - Makefile
  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+    types: ready_for_review
    paths:
        - src/**
        - vendor/**
        - CMakeLists.txt
        - Makefile
-  workflow_dispatch:

 jobs:
  ubuntu-build:
@@ -29,7 +28,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"
@@ -52,9 +51,9 @@ jobs:
          Copy-Item -Path "config.ini" -Destination "bin"
        shell: pwsh
      - name: Upload build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
-          name: 'ubuntu22_04-bin-x64-${{ env.SHORT_SHA }}'
+          name: 'ubuntu20_04-bin-x64-${{ env.SHORT_SHA }}'
          path: bin

  windows-build:
@@ -106,7 +105,7 @@ jobs:
          }
        shell: pwsh
      - name: Upload build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
        with:
          name: 'windows-vs2019-bin-x64-${{ env.SHORT_SHA }}'
          path: bin
@@ -127,7 +126,7 @@ jobs:
          GITDESC=$(git describe --tags)
          mkdir $GITDESC
          echo "ARTDIR=$GITDESC" >> $GITHUB_ENV
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
        with:
          path: ${{ env.ARTDIR }}
      - name: Upload artifacts
--- a/.github/workflows/push-docker-image.yml
+++ b/.github/workflows/push-docker-image.yml
@@ -1,38 +0,0 @@
-name: Push Docker Image
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-jobs:
-  push-docker-image:
-    name: Push Docker Image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v4
-      - name: Retrieve major version
-        uses: winterjung/split@v2
-        id: split
-        with:
-          msg: ${{ github.ref_name }}
-          separator: .
-      - name: Log in to registry
-        uses: docker/login-action@v3
-        with:
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          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
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.ref_name }},${{ secrets.DOCKERHUB_REPOSITORY }}:${{ steps.split.outputs._0 }},${{ secrets.DOCKERHUB_REPOSITORY }}:latest
--- a/42
+++ b/42
@@ -1,41 +1,21 @@
-# build
-FROM alpine:3 as build
+FROM debian:latest

 WORKDIR /usr/src/app

-RUN apk update && apk upgrade && apk add \
-linux-headers \
+RUN apt-get -y update && apt-get install -y \
 git \
-clang18 \
+clang \
 make \
-sqlite-dev
+libsqlite3-dev

-COPY src ./src
-COPY vendor ./vendor
-COPY .git ./.git
-COPY Makefile CMakeLists.txt version.h.in ./
+COPY . ./

-RUN sed -i 's/^CC=clang$/&-18/' Makefile
-RUN sed -i 's/^CXX=clang++$/&-18/' Makefile
+RUN make -j8

-RUN make nosandbox -j$(nproc)
+# tabledata should be copied from the host;
+# clone it there before building the container
+#RUN git submodule update --init --recursive

-# prod
-FROM alpine:3
+CMD ["./bin/fusion"]

-WORKDIR /usr/src/app
-
-RUN apk update && apk upgrade && apk add \
-libstdc++ \
-sqlite-dev
-
-COPY --from=build /usr/src/app/bin/fusion /bin/fusion
-COPY sql ./sql
-
-CMD ["/bin/fusion"]
-
-EXPOSE 23000/tcp
-EXPOSE 23001/tcp
-EXPOSE 8003/tcp
-
-LABEL Name=openfusion Version=2.0.0
+LABEL Name=openfusion Version=0.0.1
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2025 OpenFusion Contributors
+Copyright (c) 2020-2023 OpenFusion Contributors

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/10
+++ b/10
@@ -95,6 +95,8 @@ CXXHDR=\
 	vendor/bcrypt/BCrypt.hpp\
 	vendor/INIReader.hpp\
 	vendor/JSON.hpp\
+	vendor/INIReader.hpp\
+	vendor/JSON.hpp\
 	src/Buffs.hpp\
 	src/Chat.hpp\
 	src/CustomCommands.hpp\
@@ -115,7 +117,6 @@ CXXHDR=\
 	src/settings.hpp\
 	src/Transport.hpp\
 	src/TableData.hpp\
-	src/Bucket.hpp\
 	src/Chunking.hpp\
 	src/Buddies.hpp\
 	src/Groups.hpp\
@@ -134,8 +135,6 @@ HDR=$(CHDR) $(CXXHDR)
 all: $(SERVER)

 windows: $(SERVER)
-nosandbox: $(SERVER)
-nolandlock: $(SERVER)

 # assign Windows-specific values if targeting Windows
 windows : CC=$(WIN_CC)
@@ -145,9 +144,6 @@ windows : CXXFLAGS=$(WIN_CXXFLAGS)
 windows : LDFLAGS=$(WIN_LDFLAGS)
 windows : SERVER=$(WIN_SERVER)

-nosandbox : CFLAGS+=-DCONFIG_NOSANDBOX=1
-nolandlock : CFLAGS+=-DCONFIG_NOLANDLOCK=1
-
 .SUFFIXES: .o .c .cpp .h .hpp

 .c.o:
@@ -169,7 +165,7 @@ version.h:

 src/main.o: version.h

-.PHONY: all windows nosandbox nolandlock clean nuke
+.PHONY: all windows clean nuke

 # only gets rid of OpenFusion objects, so we don't need to
 # recompile the libs every time
--- a/README.md
+++ b/README.md
@@ -1,35 +1,35 @@
-<p align="center"><img width="640" src="res/openfusion-hero.png" alt="OpenFusion Logo"></p>
+<p align="center"><img width="640" src="res/openfusion-hero.png" alt=""></p>

 <p align="center">
    <a href="https://github.com/OpenFusionProject/OpenFusion/releases/latest"><img src="https://img.shields.io/github/v/release/OpenFusionProject/OpenFusion" alt="Current Release"></a>
    <a href="https://github.com/OpenFusionProject/OpenFusion/actions/workflows/check-builds.yaml"><img src="https://github.com/OpenFusionProject/OpenFusion/actions/workflows/check-builds.yaml/badge.svg" alt="Workflow"></a>
-    <a href="https://hub.docker.com/repository/docker/openfusion/openfusion/"><img src="https://badgen.net/docker/pulls/openfusion/openfusion?icon=docker&label=pulls"></a>
    <a href="https://discord.gg/DYavckB"><img src="https://img.shields.io/badge/chat-on%20discord-7289da.svg?logo=discord" alt="Discord"></a>
    <a href="https://github.com/OpenFusionProject/OpenFusion/blob/master/LICENSE.md"><img src="https://img.shields.io/github/license/OpenFusionProject/OpenFusion" alt="License"></a>
 </p>

-OpenFusion is a reverse-engineered server for FusionFall. It primarily targets versions `beta-20100104` and `beta-20111013` of the original game, with [limited support](https://openfusion.dev/docs/reference/fusionfall-version-support/) for others.
+OpenFusion is a reverse-engineered server for FusionFall. It primarily targets versions `beta-20100104` and `beta-20111013` of the original game, with [limited support](https://github.com/OpenFusionProject/OpenFusion/wiki/FusionFall-Version-Support) for others.

 ## Usage

 ### Getting Started
 #### Method A: Installer (Easiest)
-1. Download the launcher installer by clicking [here](https://github.com/OpenFusionProject/OpenFusionLauncher/releases/latest/download/OpenFusionLauncher-Windows-Installer.exe) - choose to run the file.
-2. After a few moments, the launcher should open: you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
+1. Download the client installer by clicking [here](https://github.com/OpenFusionProject/OpenFusion/releases/download/1.4/OpenFusionClient-1.4-Installer.exe) - choose to run the file.
+2. After a few moments, the client should open: you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
 3. To create an account, simply enter the details you wish to use at the login screen then click Log In. Do *not* click register, as this will just lead to a blank screen.
 4. Make a new character, and enjoy the game! Your progress will be saved automatically, and you can resume playing by entering the login details you used in step 3.

 #### Method B: Standalone .zip file
-1. Download the launcher from [here](https://github.com/OpenFusionProject/OpenFusionLauncher/releases/latest/download/OpenFusionLauncher-Windows-Portable.zip).
+1. Download the client from [here](https://github.com/OpenFusionProject/OpenFusion/releases/download/1.4/OpenFusionClient-1.4.zip).
 2. Extract it to a folder of your choice. Note: if you are upgrading from an older version, it is preferable to start with a fresh folder rather than overwriting a previous install.
-3. Run OpenFusionLauncher.exe - you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
+3. Run OpenFusionClient.exe - you will be given a choice between two public servers by default. Select the one you wish to play and click connect.
 4. To create an account, simply enter the details you wish to use at the login screen then click Log In. Do *not* click register, as this will just lead to a blank screen.
 5. Make a new character, and enjoy the game! Your progress will be saved automatically, and you can resume playing by entering the login details you used in step 4.

-Instructions for getting the client to run on Linux through Wine can be found [here](https://openfusion.dev/docs/guides/running-on-linux/).
+Instructions for getting the client to run on Linux through Wine can be found [here](https://github.com/OpenFusionProject/OpenFusion/wiki/Running-the-game-client-on-Linux).

 ### Hosting a server
-1. Grab `OpenFusionServer-Windows-Original.zip` or `OpenFusionServer-Windows-Academy.zip` from [here](https://github.com/OpenFusionProject/OpenFusion/releases/latest).
+
+1. Grab `OpenFusionServer-1.4-original.zip` or `OpenFusionServer-1.4-academy.zip` from [here](https://github.com/OpenFusionProject/OpenFusion/releases/tag/1.4).
 2. Extract it to a folder of your choice, then run `winfusion.exe` (Windows) or `fusion` (Linux) to start the server.
 3. Add a new server to the client's list:
    1. For Description, enter anything you want. This is what will show up in the server list.
@@ -54,7 +54,10 @@ FusionFall consists of the following components:

 The original game made use of the player's actual web browser to launch the game, but since then the NPAPI plugin interface the game relied on has been deprecated and is no longer available in most modern browsers. Both Retro and OpenFusion get around this issue by distributing an older version of Electron, a software package that is essentially a specialized web browser.

-The browser/Electron client opens a web page with an `<embed>` tag of the appropriate MIME type, where the `src` param is the address of the game's `.unity3d` entrypoint. This triggers the browser to load an NPAPI plugin that handles said MIME type, in this case the Unity Web Player.
+The browser/Electron client opens a web page with an `<embed>` tag of MIME type `application/vnd.unity`, where the `src` param is the address of the game's `.unity3d` entrypoint.
+
+This triggers the browser to load an NPAPI plugin that handles this MIME type, the Unity Web Player, which the browser looks for in `C:\Users\%USERNAME%\AppData\LocalLow\Unity\WebPlayer`.
+The Web Player was previously copied there by `installUnity.bat`.

 Note that the version of the web player distributed with OpenFusion expects a standard `UnityWeb` magic number for all assets, instead of Retro's modified `streamed` magic number.
 This will potentially become relevant later, as people start experimenting and mixing and matching versions.
@@ -63,7 +66,7 @@ The web player will execute the game code, which will request the following file

 `/assetInfo.php` contains the address from which to fetch the rest of the game's assets (the "dongresources").
 Normally those would be hosted on the same web server as the gateway, but the OpenFusion distribution (in it's default configuration) doesn't use a web server at all!
-It instead loads the web pages locally using the `file://` schema, and fetches the game's assets from a standard web server.
+It loads the web pages locally using the `file://` schema, and fetches the game's assets from Turner's CDN (which is still hosting them to this day!).

 `/loginInfo.php` contains the IP:port pair of the FusionFall login server, which the client will connect to. This login server drives the client while it's in the Character Selection menu, as well as Character Creation and the Tutorial.

@@ -80,17 +83,17 @@ This just works if you're all under the same LAN, but if you want to play over t

 ## Compiling 

-OpenFusion has one external dependency: SQLite. The oldest compatible version is `3.33.0`. You can install it on Windows using `vcpkg`, and on Unix/Linux using your distribution's package manager. For a more indepth guide on how to set up vcpkg, [read this guide](https://openfusion.dev/docs/development/installing-sqlite-on-windows-using-vcpkg/).
+OpenFusion has one external dependency: SQLite. The oldest compatible version is `3.33.0`. You can install it on Windows using `vcpkg`, and on Unix/Linux using your distribution's package manager. For a more indepth guide on how to set up vcpkg, [read this guide on the wiki](https://github.com/OpenFusionProject/OpenFusion/wiki/Installing-SQLite-on-Windows-using-vcpkg).

 You have two choices for compiling OpenFusion: the included Makefile and the included CMakeLists file.

 ### Makefile

-A detailed compilation guide is available for Windows users on the website [using MinGW-w64 and MSYS2](https://openfusion.dev/docs/development/compilation-on-windows-msys2-mingw/). Otherwise, to compile it for the current platform you're on, just run `make` with the correct build tools installed (currently make and clang).
+A detailed compilation guide is available for Windows users in the wiki [using MinGW-w64 and MSYS2](https://github.com/OpenFusionProject/OpenFusion/wiki/Compilation-on-Windows). Otherwise, to compile it for the current platform you're on, just run `make` with the correct build tools installed (currently make and clang).

 ### CMake

-A detailed guide is available [in our documentation](https://openfusion.dev/docs/development/compilation-with-cmake-or-visual-studio/) for people using regular old CMake or the version of CMake that comes with Visual Studio. TL;DR: `cmake -B build`
+A detailed guide is available [on the wiki](https://github.com/OpenFusionProject/OpenFusion/wiki/Compilation-with-CMake-or-Visual-Studio) for people using regular old CMake or the version of CMake that comes with Visual Studio. tl;dr: `cmake -B build`

 ## Contributing

@@ -99,13 +102,26 @@ If you'd like to contribute to this project, please read [CONTRIBUTING.md](CONTR
 ## Gameplay

 The goal of the project is to faithfully recreate the game as it was at the time of the targeted build.
-While most features are implemented and the game is playable start to finish, there may be missing functionality or bugs present.
+The server is not yet complete, however, and some functionality is still missing.

-Depending on the server configuration, you'll have access to certain commands.
+Because the server is still in development, ordinary players are allowed access to a few admin commands:

-For the public servers: Original has item spawning, the ability to set player speed/jump height, and teleportation enabled (default account level 50).
-Meanwhile the Academy server is more meant for legitimate playthroughs (default account level 99).
+![](res/sane_upsell.png)

-When hosting a local server, you will have access to all commands by default (account level 1).
+### Movement commands
+* A `/speed` of around 2400 or 3000 is nice.
+* A `/jump` of about 50 will send you soaring
+* [This map](res/dong_number_map.png) (credit to Danny O) is useful for `/warp` coordinates.
+* `/goto` is useful for more precise teleportation (ie. for getting into Infected Zones, etc.).

-For a list of available commands, see [this page](https://openfusion.dev/docs/reference/ingame-command-list/).
+### Item commands
+* `/itemN [type] [itemId] [amount]`
+  (Refer to the [item list](https://docs.google.com/spreadsheets/d/1mpoJ9iTHl_xLI4wQ_9UvIDYNcsDYscdkyaGizs43TCg/))
+
+### Nano commands
+* `/nano [id] (1-36)`
+* `/nano_equip [id] (1-36) [slot] (0-2)`
+* `/nano_unequip [slot] (0-2)`
+* `/nano_active [slot] (0-2)`
+
+### A full list of commands can be found [here](https://github.com/OpenFusionProject/OpenFusion/wiki/Ingame-Command-list).
--- a/config.ini
+++ b/config.ini
@@ -12,17 +12,11 @@ sandbox=true
 [login]
 # must be kept in sync with loginInfo.php
 port=23000
-# will all name wheel names be approved instantly?
-acceptallwheelnames=true
 # will all custom names be approved instantly?
 acceptallcustomnames=true
 # should attempts to log into non-existent accounts
 # automatically create them?
 autocreateaccounts=true
-# list of supported authentication methods (comma-separated)
-# password = allow logging in with plaintext passwords
-# cookie = allow logging in with one-shot auth cookies
-authmethods=password
 # how often should everything be flushed to the database?
 # the default is 4 minutes
 dbsaveinterval=240
@@ -72,9 +66,6 @@ motd=Welcome to OpenFusion!
 # location of the database
 #dbpath=database.db

-# should there be a score cap for infected zone races?
-#izracescorecapped=true
-
 # should tutorial flags be disabled off the bat?
 disablefirstuseflag=true

@@ -104,8 +95,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
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +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
-      - ./tdata:/usr/src/app/tdata
    ports:
      - "23000:23000"
      - "23001:23001"
--- a/sql/migration4.sql
+++ b/sql/migration4.sql
@@ -1,19 +0,0 @@
-/*
-    It is recommended in the SQLite manual to turn off
-    foreign keys when making schema changes that involve them
-*/
-PRAGMA foreign_keys=OFF;
-BEGIN TRANSACTION;
-- New table to store auth cookies
-CREATE TABLE Auth (
-    AccountID   INTEGER NOT NULL,
-    Cookie      TEXT NOT NULL,
-    Expires     INTEGER DEFAULT 0 NOT NULL,
-    FOREIGN KEY(AccountID) REFERENCES Accounts(AccountID) ON DELETE CASCADE,
-    UNIQUE (AccountID)
-);
-- Update DB Version
-UPDATE Meta SET Value = 5 WHERE Key = 'DatabaseVersion';
-UPDATE Meta SET Value = strftime('%s', 'now') WHERE Key = 'LastMigration';
-COMMIT;
-PRAGMA foreign_keys=ON;
--- a/sql/migration5.sql
+++ b/sql/migration5.sql
@@ -1,8 +0,0 @@
-BEGIN TRANSACTION;
-- New Columns
-ALTER TABLE Accounts ADD Email TEXT DEFAULT '' NOT NULL;
-ALTER TABLE Accounts ADD LastPasswordReset INTEGER DEFAULT 0 NOT NULL;
-- Update DB Version
-UPDATE Meta SET Value = 6 WHERE Key = 'DatabaseVersion';
-UPDATE Meta SET Value = strftime('%s', 'now') WHERE Key = 'LastMigration';
-COMMIT;
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -1,16 +1,14 @@
 CREATE TABLE IF NOT EXISTS Accounts (
-    AccountID         INTEGER NOT NULL,
-    Login             TEXT    NOT NULL UNIQUE COLLATE NOCASE,
-    Password          TEXT    NOT NULL,
-    Selected          INTEGER  DEFAULT 1 NOT NULL,
-    AccountLevel      INTEGER NOT NULL,
-    Created           INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
-    LastLogin         INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
-    BannedUntil       INTEGER DEFAULT 0 NOT NULL,
-    BannedSince       INTEGER DEFAULT 0 NOT NULL,
-    BanReason         TEXT    DEFAULT '' NOT NULL,
-    Email             TEXT    DEFAULT '' NOT NULL,
-    LastPasswordReset INTEGER DEFAULT 0 NOT NULL,
+    AccountID    INTEGER NOT NULL,
+    Login        TEXT    NOT NULL UNIQUE COLLATE NOCASE,
+    Password     TEXT    NOT NULL,
+    Selected     INTEGER  DEFAULT 1 NOT NULL,
+    AccountLevel INTEGER NOT NULL,
+    Created      INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
+    LastLogin    INTEGER DEFAULT (strftime('%s', 'now')) NOT NULL,
+    BannedUntil  INTEGER DEFAULT 0 NOT NULL,
+    BannedSince  INTEGER DEFAULT 0 NOT NULL,
+    BanReason    TEXT    DEFAULT '' NOT NULL,
    PRIMARY KEY(AccountID AUTOINCREMENT)
 );

@@ -145,7 +143,7 @@ CREATE TABLE IF NOT EXISTS EmailItems (
    UNIQUE (PlayerID, MsgIndex, Slot)
 );

-CREATE TABLE IF NOT EXISTS RaceResults (
+CREATE TABLE IF NOT EXISTS RaceResults(
    EPID      INTEGER NOT NULL,
    PlayerID  INTEGER NOT NULL,
    Score     INTEGER NOT NULL,
@@ -155,17 +153,9 @@ CREATE TABLE IF NOT EXISTS RaceResults (
    FOREIGN KEY(PlayerID) REFERENCES Players(PlayerID) ON DELETE CASCADE
 );

-CREATE TABLE IF NOT EXISTS RedeemedCodes (
+CREATE TABLE IF NOT EXISTS RedeemedCodes(
    PlayerID    INTEGER NOT NULL,
    Code        TEXT NOT NULL,
    FOREIGN KEY(PlayerID) REFERENCES Players(PlayerID) ON DELETE CASCADE,
    UNIQUE (PlayerID, Code)
-);
-
-CREATE TABLE IF NOT EXISTS Auth (
-    AccountID   INTEGER NOT NULL,
-    Cookie      TEXT NOT NULL,
-    Expires     INTEGER DEFAULT 0 NOT NULL,
-    FOREIGN KEY(AccountID) REFERENCES Accounts(AccountID) ON DELETE CASCADE,
-    UNIQUE (AccountID)
-);
+)
--- a/src/Abilities.cpp
+++ b/src/Abilities.cpp
@@ -76,20 +76,12 @@ static SkillResult handleSkillDamageNDebuff(SkillData* skill, int power, ICombat
    }

    sSkillResult_Damage_N_Debuff result{};
-
    result.iDamage = duration / 10; // we use the duration as the damage number (why?)
    result.iHP = target->getCurrentHP();
    result.eCT = target->getCharType();
    result.iID = target->getID();
    result.bProtected = blocked;
    result.iConditionBitFlag = target->getCompositeCondition();
-
-    // for player targets, make sure to update Nano stamina
-    if (target->getCharType() == 1) {
-        Player *plr = dynamic_cast<Player*>(target);
-        result.iStamina = plr->getActiveNano()->iStamina;
-    }
-
    return SkillResult(sizeof(sSkillResult_Damage_N_Debuff), &result);
 }

@@ -120,8 +112,7 @@ static SkillResult handleSkillBuff(SkillData* skill, int power, ICombatant* sour
    int duration = skill->durationTime[power];
    int strength = skill->values[0][power];
    BuffStack passiveBuff = {
-        // if the duration is 0, it needs to be recast every tick
-        duration == 0 ? 1 : (duration * 100) / MS_PER_COMBAT_TICK, // ticks
+        skill->drainType == SkillDrainType::PASSIVE ? 1 : (duration * 100) / MS_PER_COMBAT_TICK, // ticks
        strength, // value
        source->getRef(), // source
        source == target ? BuffClass::NANO : BuffClass::GROUP_NANO, // buff class
@@ -129,10 +120,9 @@ static SkillResult handleSkillBuff(SkillData* skill, int power, ICombatant* sour

    int timeBuffId = Abilities::getCSTBFromST(skill->skillType);
    SkillDrainType drainType = skill->drainType;
-    int combatLifetime = 0;
    if(!target->addBuff(timeBuffId,
        [drainType](EntityRef self, Buff* buff, int status, BuffStack* stack) {
-            if(buff->id == ECSB_BOUNDINGBALL && status == ETBU_ADD) {
+            if(buff->id == ECSB_BOUNDINGBALL) {
                // drain
                ICombatant* combatant = dynamic_cast<ICombatant*>(self.getEntity());
                combatant->takeDamage(buff->getLastSource(), 0); // aggro
@@ -141,13 +131,11 @@ static SkillResult handleSkillBuff(SkillData* skill, int power, ICombatant* sour
            if(drainType == SkillDrainType::ACTIVE && status == ETBU_DEL)
                Buffs::timeBuffTimeout(self);
        },
-        [combatLifetime](EntityRef self, Buff* buff, time_t currTime) mutable {
-            if(buff->id == ECSB_BOUNDINGBALL &&
-                combatLifetime % COMBAT_TICKS_PER_DRAIN_PROC == 0)
-                Buffs::tickDrain(self, buff, COMBAT_TICKS_PER_DRAIN_PROC); // drain
-            combatLifetime++;
+        [](EntityRef self, Buff* buff, time_t currTime) {
+            if(buff->id == ECSB_BOUNDINGBALL)
+                Buffs::tickDrain(self, buff); // drain
        },
-        &passiveBuff)) return SkillResult();
+        &passiveBuff)) return SkillResult(); // no result if already buffed

    sSkillResult_Buff result{};
    result.eCT = target->getCharType();
@@ -334,8 +322,8 @@ void Abilities::useNanoSkill(CNSocket* sock, SkillData* skill, sNano& nano, std:
    size_t resplen = sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC);
    for(SkillResult& sr : results)
        resplen += sr.size;
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, resplen);

    sP_FE2CL_NANO_SKILL_USE_SUCC* pkt = (sP_FE2CL_NANO_SKILL_USE_SUCC*)respbuf;
    pkt->iPC_ID = plr->iID;
@@ -368,6 +356,7 @@ void Abilities::useNPCSkill(EntityRef npc, int skillID, std::vector<ICombatant*>
    SkillData* skill = &SkillTable[skillID];

    std::vector<SkillResult> results = handleSkill(skill, 0, src, affected);
+    if(results.empty()) return; // no effect; no need for confirmation packets

    // lazy validation since skill results might be different sizes
    if (!validOutVarPacket(sizeof(sP_FE2CL_NPC_SKILL_HIT), results.size(), MAX_SKILLRESULT_SIZE)) {
@@ -379,8 +368,8 @@ void Abilities::useNPCSkill(EntityRef npc, int skillID, std::vector<ICombatant*>
    size_t resplen = sizeof(sP_FE2CL_NPC_SKILL_HIT);
    for(SkillResult& sr : results)
        resplen += sr.size;
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, resplen);

    sP_FE2CL_NPC_SKILL_HIT* pkt = (sP_FE2CL_NPC_SKILL_HIT*)respbuf;
    pkt->iNPC_ID = npc.id;
--- a/src/Abilities.hpp
+++ b/src/Abilities.hpp
@@ -9,18 +9,17 @@
 #include <vector>
 #include <assert.h>

-const int COMBAT_TICKS_PER_DRAIN_PROC = 2;
 constexpr size_t MAX_SKILLRESULT_SIZE = sizeof(sSkillResult_BatteryDrain);

 enum class SkillType {
    DAMAGE = 1,
    HEAL_HP = 2,
-    KNOCKDOWN = 3, // uses DamageNDebuff
-    SLEEP = 4, // uses DamageNDebuff
-    SNARE = 5, // uses DamageNDebuff
+    KNOCKDOWN = 3, // dnd
+    SLEEP = 4, // dnd
+    SNARE = 5, // dnd
    HEAL_STAMINA = 6,
    STAMINA_SELF = 7,
-    STUN = 8, // uses DamageNDebuff
+    STUN = 8, // dnd
    WEAPONSLOW = 9,
    JUMP = 10,
    RUN = 11,
--- a/src/Bucket.hpp
+++ b/src/Bucket.hpp
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <array>
-#include <optional>
-
-#include <assert.h>
-
-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) {
-        assert(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;
-    }
-};
--- a/src/Buddies.cpp
+++ b/src/Buddies.cpp
@@ -30,7 +30,7 @@ static bool playerHasBuddyWithID(Player* plr, int buddyID) {
 #pragma endregion

 // Refresh buddy list
-void Buddies::sendBuddyList(CNSocket* sock) {
+void Buddies::refreshBuddyList(CNSocket* sock) {
    Player* plr = PlayerManager::getPlayer(sock);
    int buddyCnt = Database::getNumBuddies(plr);

@@ -41,9 +41,9 @@ void Buddies::sendBuddyList(CNSocket* sock) {

    // initialize response struct
    size_t resplen = sizeof(sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC) + buddyCnt * sizeof(sBuddyBaseInfo);
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];

-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    memset(respbuf, 0, resplen);

    sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC* resp = (sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC*)respbuf;
    sBuddyBaseInfo* respdata = (sBuddyBaseInfo*)(respbuf + sizeof(sP_FE2CL_REP_PC_BUDDYLIST_INFO_SUCC));
@@ -277,6 +277,15 @@ static void reqFindNameBuddyAccept(CNSocket* sock, CNPacketData* data) {
 // Getting buddy state
 static void reqPktGetBuddyState(CNSocket* sock, CNPacketData* data) {
    Player* plr = PlayerManager::getPlayer(sock);
+
+    /*
+     * If the buddy list wasn't synced a second time yet, sync it.
+     * Not sure why we have to do it again for the client not to trip up.
+     */
+    if (!plr->buddiesSynced) {
+        refreshBuddyList(sock);
+        plr->buddiesSynced = true;
+    }
    
    INITSTRUCT(sP_FE2CL_REP_GET_BUDDY_STATE_SUCC, resp);
    
--- a/src/Buddies.hpp
+++ b/src/Buddies.hpp
@@ -6,5 +6,5 @@ namespace Buddies {
    void init();

    // Buddy list
-    void sendBuddyList(CNSocket* sock);
+    void refreshBuddyList(CNSocket* sock);
 }
--- a/src/Buffs.cpp
+++ b/src/Buffs.cpp
@@ -169,18 +169,17 @@ void Buffs::timeBuffTimeout(EntityRef self) {
    NPCManager::sendToViewable(entity, &pkt, P_FE2CL_CHAR_TIME_BUFF_TIME_OUT, sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_OUT));
 }

-void Buffs::tickDrain(EntityRef self, Buff* buff, int mult) {
+void Buffs::tickDrain(EntityRef self, Buff* buff) {
    if(self.kind != EntityKind::COMBAT_NPC && self.kind != EntityKind::MOB)
        return; // not implemented
    Entity* entity = self.getEntity();
    ICombatant* combatant = dynamic_cast<ICombatant*>(entity);
-    int damage = combatant->getMaxHP() / 100 * mult;
-    int dealt = combatant->takeDamage(buff->getLastSource(), damage);
+    int damage = combatant->takeDamage(buff->getLastSource(), combatant->getMaxHP() / 100);

    size_t resplen = sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK) + sizeof(sSkillResult_Damage);
-    assert(resplen < CN_PACKET_BODY_SIZE);
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE - 8);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, resplen);

    sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK *pkt = (sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK*)respbuf;
    pkt->iID = self.id;
@@ -188,7 +187,7 @@ void Buffs::tickDrain(EntityRef self, Buff* buff, int mult) {
    pkt->iTB_ID = ECSB_BOUNDINGBALL;

    sSkillResult_Damage *drain = (sSkillResult_Damage*)(respbuf + sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK));
-    drain->iDamage = dealt;
+    drain->iDamage = damage;
    drain->iHP = combatant->getCurrentHP();
    drain->eCT = pkt->eCT;
    drain->iID = pkt->iID;
--- a/src/Buffs.hpp
+++ b/src/Buffs.hpp
@@ -89,5 +89,5 @@ namespace Buffs {
    void timeBuffUpdate(EntityRef self, Buff* buff, int status, BuffStack* stack);
    void timeBuffTick(EntityRef self, Buff* buff);
    void timeBuffTimeout(EntityRef self);
-    void tickDrain(EntityRef self, Buff* buff, int mult);
+    void tickDrain(EntityRef self, Buff* buff);
 }
--- a/src/BuiltinCommands.cpp
+++ b/src/BuiltinCommands.cpp
@@ -72,10 +72,10 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {

    // Handle serverside value-changes
    switch (setData->iSetValueType) {
-    case CN_GM_SET_VALUE_TYPE__HP:
+    case 1:
        response.iSetValue = plr->HP = setData->iSetValue;
        break;
-    case CN_GM_SET_VALUE_TYPE__WEAPON_BATTERY :
+    case 2:
        plr->batteryW = setData->iSetValue;

        // caps
@@ -84,7 +84,7 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {

        response.iSetValue = plr->batteryW;
        break;
-    case CN_GM_SET_VALUE_TYPE__NANO_BATTERY:
+    case 3:
        plr->batteryN = setData->iSetValue;

        // caps
@@ -93,17 +93,13 @@ static void setValuePlayer(CNSocket* sock, CNPacketData* data) {

        response.iSetValue = plr->batteryN;
        break;
-    case CN_GM_SET_VALUE_TYPE__FUSION_MATTER:
+    case 4:
        Missions::updateFusionMatter(sock, setData->iSetValue - plr->fusionmatter);
        response.iSetValue = plr->fusionmatter;
        break;
-    case CN_GM_SET_VALUE_TYPE__CANDY:
+    case 5:
        response.iSetValue = plr->money = setData->iSetValue;
        break;
-    case CN_GM_SET_VALUE_TYPE__SPEED:
-    case CN_GM_SET_VALUE_TYPE__JUMP:
-        response.iSetValue = setData->iSetValue;
-        break;
    }

    response.iPC_ID = setData->iPC_ID;
--- a/src/Chat.cpp
+++ b/src/Chat.cpp
@@ -1,7 +1,6 @@
 #include "Chat.hpp"

 #include "servers/CNShardServer.hpp"
-#include "servers/Monitor.hpp"

 #include "Player.hpp"
 #include "PlayerManager.hpp"
@@ -9,6 +8,8 @@

 #include <assert.h>

+std::vector<std::string> Chat::dump;
+
 using namespace Chat;

 static void chatHandler(CNSocket* sock, CNPacketData* data) {
@@ -27,7 +28,7 @@ static void chatHandler(CNSocket* sock, CNPacketData* data) {
    std::string logLine = "[FreeChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;

    std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);

    // send to client
    INITSTRUCT(sP_FE2CL_REP_SEND_FREECHAT_MESSAGE_SUCC, resp);
@@ -50,7 +51,7 @@ static void menuChatHandler(CNSocket* sock, CNPacketData* data) {
    std::string logLine = "[MenuChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;

    std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);

    // send to client
    INITSTRUCT(sP_FE2CL_REP_SEND_MENUCHAT_MESSAGE_SUCC, resp);
@@ -102,14 +103,14 @@ static void announcementHandler(CNSocket* sock, CNPacketData* data) {
    memcpy(msg.szAnnounceMsg, announcement->szAnnounceMsg, sizeof(msg.szAnnounceMsg));
    std::map<CNSocket*, Player*>::iterator it;

-    // This value is completely arbitrary, but these make the most sense when you consider the architecture of the game
    switch (announcement->iAreaType) {
    case 0: // area (all players in viewable chunks)
        sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
        PlayerManager::sendToViewable(sock, msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
        break;
-    case 1: // channel
-    case 2: // shard
+    case 1: // shard
+    case 2: // world
+        break; // not applicable to OpenFusion
    case 3: // global (all players)
        for (it = PlayerManager::players.begin(); it != PlayerManager::players.end(); it++) {
            CNSocket* allSock = it->first;
@@ -119,12 +120,9 @@ static void announcementHandler(CNSocket* sock, CNPacketData* data) {
        break;
    }

-    std::string logLine = std::to_string(announcement->iAreaType) + " "
-                        + std::to_string(announcement->iAnnounceType) + " "
-                        + std::to_string(announcement->iDuringTime) + " "
-                        + PlayerManager::getPlayerName(plr, false) + ": " + AUTOU16TOU8(msg.szAnnounceMsg);
-    std::cout << "Broadcast " << logLine << std::endl;
-    Monitor::bcasts.push_back(logLine);
+    std::string logLine = "[Bcast " + std::to_string(announcement->iAreaType) + "] " + PlayerManager::getPlayerName(plr, false) + ": " + AUTOU16TOU8(msg.szAnnounceMsg);
+    std::cout << logLine << std::endl;
+    dump.push_back("**" + logLine + "**");
 }

 // Buddy freechatting
@@ -157,7 +155,7 @@ static void buddyChatHandler(CNSocket* sock, CNPacketData* data) {

    std::string logLine = "[BuddyChat] " + PlayerManager::getPlayerName(plr) + " (to " + PlayerManager::getPlayerName(otherPlr) + "): " + fullChat;
    std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);

    U8toU16(fullChat, (char16_t*)&resp.szFreeChat, sizeof(resp.szFreeChat));

@@ -187,7 +185,7 @@ static void buddyMenuChatHandler(CNSocket* sock, CNPacketData* data) {
    std::string logLine = "[BuddyMenuChat] " + PlayerManager::getPlayerName(plr) + " (to " + PlayerManager::getPlayerName(otherPlr) + "): " + fullChat;

    std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);

    U8toU16(fullChat, (char16_t*)&resp.szFreeChat, sizeof(resp.szFreeChat));

@@ -220,7 +218,7 @@ static void tradeChatHandler(CNSocket* sock, CNPacketData* data) {
    std::string logLine = "[TradeChat] " + PlayerManager::getPlayerName(plr) + " (to " + PlayerManager::getPlayerName(otherPlr) + "): " + fullChat;

    std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);

    resp.iEmoteCode = pacdat->iEmoteCode;
    sock->sendPacket(resp, P_FE2CL_REP_PC_TRADE_EMOTES_CHAT);
@@ -243,7 +241,7 @@ static void groupChatHandler(CNSocket* sock, CNPacketData* data) {

    std::string logLine = "[GroupChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;
    std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);

    // send to client
    INITSTRUCT(sP_FE2CL_REP_SEND_ALL_GROUP_FREECHAT_MESSAGE_SUCC, resp);
@@ -266,7 +264,7 @@ static void groupMenuChatHandler(CNSocket* sock, CNPacketData* data) {
    std::string logLine = "[GroupMenuChat] " + PlayerManager::getPlayerName(plr, true) + ": " + fullChat;

    std::cout << logLine << std::endl;
-    Monitor::chats.push_back(logLine);
+    dump.push_back(logLine);

    // send to client
    INITSTRUCT(sP_FE2CL_REP_SEND_ALL_GROUP_MENUCHAT_MESSAGE_SUCC, resp);
--- a/src/Chat.hpp
+++ b/src/Chat.hpp
@@ -8,6 +8,7 @@
 #include <vector>

 namespace Chat {
+    extern std::vector<std::string> dump;
    void init();

    void sendServerMessage(CNSocket* sock, std::string msg); // uses MOTD
--- a/src/Chunking.cpp
+++ b/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,12 +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_BODY_SIZE - sizeof(int32_t)) / sizeof(sPCAppearanceData);
-constexpr size_t MAX_NPC_PER_AROUND = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(sNPCAppearanceData);
-constexpr size_t MAX_SHINY_PER_AROUND = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(sShinyAppearanceData);
-constexpr size_t MAX_TRANSPORTATION_PER_AROUND = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(sTransportationAppearanceData);
-constexpr size_t MAX_IDS_PER_AROUND_DEL = (CN_PACKET_BODY_SIZE - sizeof(int32_t)) / sizeof(int32_t);
-constexpr size_t MAX_TRANSPORTATION_IDS_PER_AROUND_DEL = MAX_IDS_PER_AROUND_DEL - 1; // 1 less for eTT

 std::map<ChunkPos, Chunk*> Chunking::chunks;

@@ -83,80 +75,11 @@ void Chunking::untrackEntity(ChunkPos chunkPos, const EntityRef ref) {
        deleteChunk(chunkPos);
 }

-template<class T, size_t N>
-static void sendAroundPackets(const EntityRef recipient, std::vector<Bucket<T, N>>& buckets, uint32_t packetId) {
-    assert(recipient.kind == EntityKind::PLAYER);
-
-    uint8_t pktBuf[CN_PACKET_BODY_SIZE];
-    for (const auto& bucket : buckets) {
-        memset(pktBuf, 0, CN_PACKET_BODY_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 sendAroundDelPackets(const EntityRef recipient, std::vector<Bucket<int32_t, N>>& buckets, uint32_t packetId) {
-    assert(recipient.kind == EntityKind::PLAYER);
-
-    uint8_t pktBuf[CN_PACKET_BODY_SIZE];
-    for (const auto& bucket : buckets) {
-        memset(pktBuf, 0, CN_PACKET_BODY_SIZE);
-        int count = bucket.size();
-        assert(count <= N);
-
-        size_t baseSize;
-        if (packetId == P_FE2CL_AROUND_DEL_TRANSPORTATION) {
-            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({});
-    auto& bucket = buckets[buckets.size() - 1];
-    bucket.add(data);
-    if (bucket.isFull())
-        buckets.push_back({});
-}
-
-template<size_t N>
-static void bufferIdForDisappearance(std::vector<Bucket<int32_t, N>>& buckets, int32_t id) {
-    if (buckets.empty())
-        buckets.push_back({});
-    auto& bucket = buckets[buckets.size() - 1];
-    bucket.add(id);
-    if (bucket.isFull())
-        buckets.push_back({});
-}
-
 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
@@ -172,38 +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
@@ -213,27 +105,13 @@ void Chunking::addEntityToChunks(std::set<Chunk*> chnks, const EntityRef ref) {
                ((Mob*)other)->playersInView++;
        }
    }
-
-    if (ref.kind == EntityKind::PLAYER) {
-        if (!pcAppearances.empty())
-            sendAroundPackets(ref, pcAppearances, P_FE2CL_PC_AROUND);
-        if (!npcAppearances.empty())
-            sendAroundPackets(ref, npcAppearances, P_FE2CL_NPC_AROUND);
-        if (!shinyAppearances.empty())
-            sendAroundPackets(ref, shinyAppearances, P_FE2CL_SHINY_AROUND);
-        if (!transportationAppearances.empty())
-            sendAroundPackets(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_TRANSPORTATION_IDS_PER_AROUND_DEL>> transportationDisappearances;
+    // TODO: same as above
    for (Chunk *chunk : chnks) {
        for (const EntityRef otherRef : chunk->entities) {
            // skip oneself
@@ -249,29 +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
@@ -281,17 +137,6 @@ void Chunking::removeEntityFromChunks(std::set<Chunk*> chnks, const EntityRef re
                ((Mob*)other)->playersInView--;
        }
    }
-
-    if (ref.kind == EntityKind::PLAYER) {
-        if (!pcDisappearances.empty())
-            sendAroundDelPackets(ref, pcDisappearances, P_FE2CL_AROUND_DEL_PC);
-        if (!npcDisappearances.empty())
-            sendAroundDelPackets(ref, npcDisappearances, P_FE2CL_AROUND_DEL_NPC);
-        if (!shinyDisappearances.empty())
-            sendAroundDelPackets(ref, shinyDisappearances, P_FE2CL_AROUND_DEL_SHINY);
-        if (!transportationDisappearances.empty())
-            sendAroundDelPackets(ref, transportationDisappearances, P_FE2CL_AROUND_DEL_TRANSPORTATION);
-    }
 }

 static void emptyChunk(ChunkPos chunkPos) {
--- a/src/Combat.cpp
+++ b/src/Combat.cpp
@@ -175,13 +175,10 @@ void Player::step(time_t currTime) {
 #pragma endregion

 #pragma region CombatNPC
-bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCallback<time_t> onTick, BuffStack* stack) {
+bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, BuffCallback<time_t> onTick, BuffStack* stack) { /* stubbed */
    if(!isAlive())
        return false;

-    if (this->state != AIState::COMBAT && this->state != AIState::ROAMING)
-        return false;
-
    if(!hasBuff(buffId)) {
        buffs[buffId] = new Buff(buffId, getRef(), onUpdate, onTick, stack);
        return true;
@@ -192,7 +189,7 @@ bool CombatNPC::addBuff(int buffId, BuffCallback<int, BuffStack*> onUpdate, Buff
    return false;
 }

-Buff* CombatNPC::getBuff(int buffId) {
+Buff* CombatNPC::getBuff(int buffId) { /* stubbed */
    if(hasBuff(buffId)) {
        return buffs[buffId];
    }
@@ -310,19 +307,19 @@ void CombatNPC::step(time_t currTime) {
 }

 void CombatNPC::transition(AIState newState, EntityRef src) {
-    state = newState;

+    state = newState;
    if (transitionHandlers.find(newState) != transitionHandlers.end())
        transitionHandlers[newState](this, src);
    else {
        std::cout << "[WARN] Transition to " << (int)state << " has no handler; going inactive" << std::endl;
        transition(AIState::INACTIVE, id);
    }
-
-    // trigger special NPCEvents, if applicable
+    /* TODO: fire any triggered events
    for (NPCEvent& event : NPCManager::NPCEvents)
-        if (event.triggerState == newState && event.npcType == type)
-            event.handler(this);
+        if (event.trigger == ON_KILLED && event.npcType == type)
+            event.handler(src, this);
+    */
 }
 #pragma endregion

@@ -365,7 +362,7 @@ static std::pair<int,int> getDamage(int attackPower, int defensePower, bool shou
    return ret;
 }

-static bool checkRapidFire(CNSocket *sock, int targetCount, bool allowManyTargets) {
+static bool checkRapidFire(CNSocket *sock, int targetCount) {
    Player *plr = PlayerManager::getPlayer(sock);
    time_t currTime = getTime();

@@ -377,7 +374,7 @@ static bool checkRapidFire(CNSocket *sock, int targetCount, bool allowManyTarget
    plr->lastShot = currTime;

    // 3+ targets should never be possible
-    if (!allowManyTargets && targetCount > 3)
+    if (targetCount > 3)
        plr->suspicionRating += 10001;

    // kill the socket when the player is too suspicious
@@ -396,7 +393,7 @@ static void pcAttackNpcs(CNSocket *sock, CNPacketData *data) {
    auto targets = (int32_t*)data->trailers;

    // kick the player if firing too rapidly
-    if (settings::ANTICHEAT && checkRapidFire(sock, pkt->iNPCCnt, false))
+    if (settings::ANTICHEAT && checkRapidFire(sock, pkt->iNPCCnt))
        return;

    /*
@@ -539,9 +536,9 @@ static void dealGooDamage(CNSocket *sock) {
        return; // ignore completely

    size_t resplen = sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK) + sizeof(sSkillResult_DotDamage);
-    assert(resplen < CN_PACKET_BODY_SIZE);
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE - 8);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, resplen);

    sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK *pkt = (sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK*)respbuf;
    sSkillResult_DotDamage *dmg = (sSkillResult_DotDamage*)(respbuf + sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK));
@@ -633,9 +630,9 @@ static void pcAttackChars(CNSocket *sock, CNPacketData *data) {

    // initialize response struct
    size_t resplen = sizeof(sP_FE2CL_PC_ATTACK_CHARs_SUCC) + pkt->iTargetCnt * sizeof(sAttackResult);
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];

-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    memset(respbuf, 0, resplen);

    sP_FE2CL_PC_ATTACK_CHARs_SUCC *resp = (sP_FE2CL_PC_ATTACK_CHARs_SUCC*)respbuf;
    sAttackResult *respdata = (sAttackResult*)(respbuf+sizeof(sP_FE2CL_PC_ATTACK_CHARs_SUCC));
@@ -837,19 +834,15 @@ static void projectileHit(CNSocket* sock, CNPacketData* data) {
        return;
    }

-    // kick the player if firing too rapidly
-    if (settings::ANTICHEAT && checkRapidFire(sock, pkt->iTargetCnt, true))
-        return;
-
    /*
     * initialize response struct
     * rocket style hit doesn't work properly, so we're always sending this one
     */

    size_t resplen = sizeof(sP_FE2CL_PC_GRENADE_STYLE_HIT) + pkt->iTargetCnt * sizeof(sAttackResult);
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];

-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    memset(respbuf, 0, resplen);

    sP_FE2CL_PC_GRENADE_STYLE_HIT* resp = (sP_FE2CL_PC_GRENADE_STYLE_HIT*)respbuf;
    sAttackResult* respdata = (sAttackResult*)(respbuf + sizeof(sP_FE2CL_PC_GRENADE_STYLE_HIT));
--- a/src/CustomCommands.cpp
+++ b/src/CustomCommands.cpp
@@ -83,77 +83,7 @@ static void helpCommand(std::string full, std::vector<std::string>& args, CNSock
 }

 static void accessCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) {
-    if (args.size() < 2) {
-        Chat::sendServerMessage(sock, "Usage: /access <id> [new_level]");
-        Chat::sendServerMessage(sock, "Use . for id to select yourself");
-        return;
-    }
-
-    char *tmp;
-
-    Player* self = PlayerManager::getPlayer(sock);
-    int selfAccess = self->accountLevel;
-
-    Player* player;
-    if (args[1].compare(".") == 0) {
-        player = self;
-    } else {
-        int id = std::strtol(args[1].c_str(), &tmp, 10);
-        if (*tmp) {
-            Chat::sendServerMessage(sock, "Invalid player ID " + args[1]);
-            return;
-        }
-
-        player = PlayerManager::getPlayerFromID(id);
-        if (player == nullptr) {
-            Chat::sendServerMessage(sock, "Could not find player with ID " + std::to_string(id));
-            return;
-        }
-
-        // Messing with other players requires a baseline access of 30
-        if (player != self && selfAccess > 30) {
-            Chat::sendServerMessage(sock, "Can't check or change other players access levels (insufficient privileges)");
-            return;
-        }
-    }
-
-    std::string playerName = PlayerManager::getPlayerName(player);
-    int currentAccess = player->accountLevel;
-    if (args.size() < 3) {
-        // just check
-        Chat::sendServerMessage(sock, playerName + " has access level " + std::to_string(currentAccess));
-        return;
-    }
-
-    // Can't change the access level of someone with stronger privileges
-    // N.B. lower value = stronger privileges
-    if (currentAccess <= selfAccess) {
-        Chat::sendServerMessage(sock, "Can't change this player's access level (insufficient privileges)");
-        return;
-    }
-
-    int newAccess = std::strtol(args[2].c_str(), &tmp, 10);
-    if (*tmp) {
-        Chat::sendServerMessage(sock, "Invalid access level " + args[2]);
-        return;
-    }
-
-    // Can only assign an access level weaker than yours
-    if (newAccess <= selfAccess) {
-        Chat::sendServerMessage(sock, "Can only assign privileges weaker than your own");
-        return;
-    }
-
-    player->accountLevel = newAccess;
-
-    // Save to database
-    int accountId = Database::getAccountIdForPlayer(player->iID);
-    Database::updateAccountLevel(accountId, newAccess);
-
-    std::string msg = "Changed access level for " + playerName + " from " + std::to_string(currentAccess) + " to " + std::to_string(newAccess);
-    if (newAccess <= 50 && currentAccess > 50)
-        msg += " (they must log out and back in for some commands to be enabled)";
-    Chat::sendServerMessage(sock, msg);
+    Chat::sendServerMessage(sock, "Your access level is " + std::to_string(PlayerManager::getPlayer(sock)->accountLevel));
 }

 static void populationCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) {
@@ -1270,7 +1200,7 @@ static void registerCommand(std::string cmd, int requiredLevel, CommandHandler h

 void CustomCommands::init() {
    registerCommand("help", 100, helpCommand, "list all unlocked server-side commands");
-    registerCommand("access", 100, accessCommand, "check or change access levels");
+    registerCommand("access", 100, accessCommand, "print your access level");
    registerCommand("instance", 30, instanceCommand, "print or change your current instance");
    registerCommand("mss", 30, mssCommand, "edit Monkey Skyway routes");
    registerCommand("npcr", 30, npcRotateCommand, "rotate NPCs");
--- a/src/Eggs.cpp
+++ b/src/Eggs.cpp
@@ -87,8 +87,8 @@ void Eggs::eggBuffPlayer(CNSocket* sock, int skillId, int eggId, int duration) {

    // initialize response struct
    size_t resplen = sizeof(sP_FE2CL_NPC_SKILL_HIT) + result.size;
-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, resplen);

    sP_FE2CL_NPC_SKILL_HIT* pkt = (sP_FE2CL_NPC_SKILL_HIT*)respbuf;
    pkt->iNPC_ID = eggId;
@@ -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);
@@ -183,7 +192,7 @@ static void eggPickup(CNSocket* sock, CNPacketData* data) {
    // drop
    if (type->dropCrateId != 0) {
        const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward);
-        assert(resplen < CN_PACKET_BODY_SIZE);
+        assert(resplen < CN_PACKET_BUFFER_SIZE - 8);
        // we know it's only one trailing struct, so we can skip full validation

        uint8_t respbuf[resplen]; // not a variable length array, don't worry
--- a/src/Eggs.hpp
+++ b/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);
 }
--- a/src/Email.cpp
+++ b/src/Email.cpp
@@ -3,7 +3,6 @@
 #include "core/Core.hpp"
 #include "db/Database.hpp"
 #include "servers/CNShardServer.hpp"
-#include "servers/Monitor.hpp"

 #include "PlayerManager.hpp"
 #include "Items.hpp"
@@ -11,6 +10,8 @@

 using namespace Email;

+std::vector<std::string> Email::dump;
+
 // New email notification
 static void emailUpdateCheck(CNSocket* sock, CNPacketData* data) {
    INITSTRUCT(sP_FE2CL_REP_PC_NEW_EMAIL, resp);
@@ -323,14 +324,7 @@ static void emailSend(CNSocket* sock, CNPacketData* data) {

    std::string logEmail = "[Email] " + PlayerManager::getPlayerName(plr, true) + " (to " + PlayerManager::getPlayerName(&otherPlr, true) + "): <" + email.SubjectLine + ">\n" + email.MsgBody;
    std::cout << logEmail << std::endl;
-    Monitor::emails.push_back(logEmail);
-
-    // notification to recipient if online
-    CNSocket* recipient = PlayerManager::getSockFromID(pkt->iTo_PCUID);
-    if (recipient != nullptr)
-    {
-        emailUpdateCheck(recipient, nullptr);
-    }
+    dump.push_back(logEmail);
 }

 void Email::init() {
--- a/src/Email.hpp
+++ b/src/Email.hpp
@@ -4,5 +4,7 @@
 #include <string>

 namespace Email {
+    extern std::vector<std::string> dump;
+    
    void init();
 }
--- a/src/Entities.cpp
+++ b/src/Entities.cpp
@@ -16,9 +16,8 @@ EntityRef::EntityRef(CNSocket *s) {
 EntityRef::EntityRef(int32_t i) {
    id = i;

-    kind = EntityKind::INVALID;
-    if (NPCManager::NPCs.find(id) != NPCManager::NPCs.end())
-        kind = NPCManager::NPCs[id]->kind;
+    assert(NPCManager::NPCs.find(id) != NPCManager::NPCs.end());
+    kind = NPCManager::NPCs[id]->kind;
 }

 bool EntityRef::isValid() const {
@@ -70,7 +69,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 +81,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() {
--- a/src/Entities.hpp
+++ b/src/Entities.hpp
@@ -106,11 +106,11 @@ struct CombatNPC : public BaseNPC, public ICombatant {

    std::unordered_map<int, Buff*> buffs = {};

-    CombatNPC(int spawnX, int spawnY, int spawnZ, int angle, uint64_t iID, int t, int id, int maxHP)
+    CombatNPC(int x, int y, int z, int angle, uint64_t iID, int t, int id, int maxHP)
        : BaseNPC(angle, iID, t, id), maxHealth(maxHP) {
-        this->spawnX = spawnX;
-        this->spawnY = spawnY;
-        this->spawnZ = spawnZ;
+        spawnX = x;
+        spawnY = y;
+        spawnZ = z;

        kind = EntityKind::COMBAT_NPC;

@@ -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();
 };
--- a/src/Groups.cpp
+++ b/src/Groups.cpp
@@ -64,9 +64,6 @@ static void attachGroupData(std::vector<EntityRef>& pcs, std::vector<EntityRef>&
 }

 void Groups::addToGroup(Group* group, EntityRef member) {
-    if (group == nullptr)
-        return;
-
    if (member.kind == EntityKind::PLAYER) {
        Player* plr = PlayerManager::getPlayer(member.sock);
        plr->group = group;
@@ -87,8 +84,8 @@ void Groups::addToGroup(Group* group, EntityRef member) {
        size_t pcCount = pcs.size();
        size_t npcCount = npcs.size();

-        uint8_t respbuf[CN_PACKET_BODY_SIZE];
-        memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+        uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+        memset(respbuf, 0, CN_PACKET_BUFFER_SIZE);
        sP_FE2CL_PC_GROUP_JOIN* pkt = (sP_FE2CL_PC_GROUP_JOIN*)respbuf;

        pkt->iID_NewMember = PlayerManager::getPlayer(member.sock)->iID;
@@ -112,9 +109,6 @@ void Groups::addToGroup(Group* group, EntityRef member) {
 }

 bool Groups::removeFromGroup(Group* group, EntityRef member) {
-    if (group == nullptr)
-        return false;
-
    if (member.kind == EntityKind::PLAYER) {
        Player* plr = PlayerManager::getPlayer(member.sock);
        plr->group = nullptr; // no dangling pointers here muahaahahah
@@ -143,8 +137,8 @@ bool Groups::removeFromGroup(Group* group, EntityRef member) {
        size_t pcCount = pcs.size();
        size_t npcCount = npcs.size();

-        uint8_t respbuf[CN_PACKET_BODY_SIZE];
-        memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+        uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+        memset(respbuf, 0, CN_PACKET_BUFFER_SIZE);
        sP_FE2CL_PC_GROUP_LEAVE* pkt = (sP_FE2CL_PC_GROUP_LEAVE*)respbuf;

        pkt->iID_LeaveMember = PlayerManager::getPlayer(member.sock)->iID;
@@ -174,9 +168,6 @@ bool Groups::removeFromGroup(Group* group, EntityRef member) {
 }

 void Groups::disbandGroup(Group* group) {
-    if (group == nullptr)
-        return;
-
    // remove everyone from the group!!
    bool done = false;
    while(!done) {
@@ -261,9 +252,6 @@ static void leaveGroup(CNSocket* sock, CNPacketData* data) {
 }

 void Groups::sendToGroup(Group* group, void* buf, uint32_t type, size_t size) {
-    if (group == nullptr)
-        return;
-
    auto players = group->filter(EntityKind::PLAYER);
    for (EntityRef ref : players) {
        ref.sock->sendPacket(buf, type, size);
@@ -271,9 +259,6 @@ void Groups::sendToGroup(Group* group, void* buf, uint32_t type, size_t size) {
 }

 void Groups::sendToGroup(Group* group, EntityRef excluded, void* buf, uint32_t type, size_t size) {
-    if (group == nullptr)
-        return;
-
    auto players = group->filter(EntityKind::PLAYER);
    for (EntityRef ref : players) {
        if(ref != excluded) ref.sock->sendPacket(buf, type, size);
@@ -288,8 +273,8 @@ void Groups::groupTickInfo(CNSocket* sock) {
    size_t pcCount = pcs.size();
    size_t npcCount = npcs.size();

-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, CN_PACKET_BUFFER_SIZE);
    sP_FE2CL_PC_GROUP_MEMBER_INFO* pkt = (sP_FE2CL_PC_GROUP_MEMBER_INFO*)respbuf;

    pkt->iID = plr->iID;
@@ -309,9 +294,6 @@ void Groups::groupTickInfo(CNSocket* sock) {

 void Groups::groupKick(Group* group, EntityRef ref) {

-    if (group == nullptr)
-        return;
-
    // if you are the group leader, destroy your own group and kick everybody
    if (group->members[0] == ref) {
        disbandGroup(group);
--- a/src/Items.cpp
+++ b/src/Items.cpp
@@ -46,7 +46,7 @@ static void nanoCapsuleHandler(CNSocket* sock, int slot, sItemBase *chest) {

    // in order to remove capsule form inventory, we have to send item reward packet with empty item
    const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward);
-    assert(resplen < CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE - 8);

    // we know it's only one trailing struct, so we can skip full validation
    uint8_t respbuf[resplen]; // not a variable length array, don't worry
@@ -416,9 +416,6 @@ static void itemDeleteHandler(CNSocket* sock, CNPacketData* data) {

    Player* plr = PlayerManager::getPlayer(sock);

-    if (itemdel->iSlotNum < 0 || itemdel->iSlotNum >= AINVEN_COUNT)
-        return; // sanity check
-
    resp.eIL = itemdel->eIL;
    resp.iSlotNum = itemdel->iSlotNum;

@@ -475,8 +472,8 @@ static void itemUseHandler(CNSocket* sock, CNPacketData* data) {
    if (gumball.iOpt == 0)
        gumball = {};

-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, resplen);

    sP_FE2CL_REP_PC_ITEM_USE_SUCC *resp = (sP_FE2CL_REP_PC_ITEM_USE_SUCC*)respbuf;
    sSkillResult_Buff *respdata = (sSkillResult_Buff*)(respbuf+sizeof(sP_FE2CL_NANO_SKILL_USE_SUCC));
@@ -556,7 +553,7 @@ static void chestOpenHandler(CNSocket *sock, CNPacketData *data) {

    // item giving packet
    const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward);
-    assert(resplen < CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE - 8);
    // we know it's only one trailing struct, so we can skip full validation

    uint8_t respbuf[resplen]; // not a variable length array, don't worry
@@ -645,7 +642,7 @@ void Items::checkItemExpire(CNSocket* sock, Player* player) {
    */

    const size_t resplen = sizeof(sP_FE2CL_PC_DELETE_TIME_LIMIT_ITEM) + sizeof(sTimeLimitItemDeleteInfo2CL);
-    assert(resplen < CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE - 8);
    // we know it's only one trailing struct, so we can skip full validation
    uint8_t respbuf[resplen]; // not a variable length array, don't worry
    auto packet = (sP_FE2CL_PC_DELETE_TIME_LIMIT_ITEM*)respbuf;
@@ -715,7 +712,7 @@ static void giveSingleDrop(CNSocket *sock, Mob* mob, int mobDropId, const DropRo
    Player *plr = PlayerManager::getPlayer(sock);

    const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward);
-    assert(resplen < CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE - 8);
    // we know it's only one trailing struct, so we can skip full validation

    uint8_t respbuf[resplen]; // not a variable length array, don't worry
--- a/src/Missions.cpp
+++ b/src/Missions.cpp
@@ -64,7 +64,7 @@ static bool isQuestItemFull(CNSocket* sock, int itemId, int itemCount) {
 static void dropQuestItem(CNSocket *sock, int task, int count, int id, int mobid) {
    std::cout << "Altered item id " << id << " by " << count << " for task id " << task << std::endl;
    const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward);
-    assert(resplen < CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE);
    // we know it's only one trailing struct, so we can skip full validation

    Player *plr = PlayerManager::getPlayer(sock);
@@ -152,14 +152,14 @@ static int giveMissionReward(CNSocket *sock, int task, int choice=0) {
        plr->Inven[slots[i]] = { 999, 999, 999, 0 }; // temp item; overwritten later
    }

-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
    size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + nrewards * sizeof(sItemReward);
-    assert(resplen < CN_PACKET_BODY_SIZE);
+    assert(resplen < CN_PACKET_BUFFER_SIZE);
    sP_FE2CL_REP_REWARD_ITEM *resp = (sP_FE2CL_REP_REWARD_ITEM *)respbuf;
    sItemReward *item = (sItemReward *)(respbuf + sizeof(sP_FE2CL_REP_REWARD_ITEM));

    // don't forget to zero the buffer!
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    memset(respbuf, 0, resplen);

    // update player
    plr->money += reward->money;
@@ -386,9 +386,6 @@ static void taskStart(CNSocket* sock, CNPacketData* data) {
 static void taskEnd(CNSocket* sock, CNPacketData* data) {
    sP_CL2FE_REQ_PC_TASK_END* missionData = (sP_CL2FE_REQ_PC_TASK_END*)data->buf;

-    if (Missions::Tasks.find(missionData->iTaskNum) == Missions::Tasks.end())
-        return;
-
    TaskData* task = Missions::Tasks[missionData->iTaskNum];

    // handle timed mission failure
--- a/src/MobAI.cpp
+++ b/src/MobAI.cpp
@@ -238,8 +238,8 @@ static void dealCorruption(Mob *mob, std::vector<int> targetData, int skillID, i
        return;
    }

-    uint8_t respbuf[CN_PACKET_BODY_SIZE];
-    memset(respbuf, 0, CN_PACKET_BODY_SIZE);
+    uint8_t respbuf[CN_PACKET_BUFFER_SIZE];
+    memset(respbuf, 0, resplen);

    sP_FE2CL_NPC_SKILL_CORRUPTION_HIT *resp = (sP_FE2CL_NPC_SKILL_CORRUPTION_HIT*)respbuf;
    sCAttackResult *respdata = (sCAttackResult*)(respbuf+sizeof(sP_FE2CL_NPC_SKILL_CORRUPTION_HIT));
@@ -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;

--- a/src/MobAI.hpp
+++ b/src/MobAI.hpp
@@ -50,8 +50,8 @@ struct Mob : public CombatNPC {
    // temporary; until we're sure what's what
    nlohmann::json data = {};

-    Mob(int spawnX, int spawnY, int spawnZ, int angle, uint64_t iID, int t, nlohmann::json d, int32_t id)
-        : CombatNPC(spawnX, spawnY, spawnZ, angle, iID, t, id, d["m_iHP"]),
+    Mob(int x, int y, int z, int angle, uint64_t iID, int t, nlohmann::json d, int32_t id)
+        : CombatNPC(x, y, z, angle, iID, t, id, d["m_iHP"]),
          sightRange(d["m_iSightRange"]) {
        state = AIState::ROAMING;

@@ -62,9 +62,9 @@ struct Mob : public CombatNPC {
        idleRange = (int)data["m_iIdleRange"];
        level = data["m_iNpcLevel"];

-        roamX = spawnX;
-        roamY = spawnY;
-        roamZ = spawnZ;
+        roamX = x;
+        roamY = y;
+        roamZ = z;

        offsetX = 0;
        offsetY = 0;
--- a/src/NPCManager.cpp
+++ b/src/NPCManager.cpp
@@ -94,49 +94,20 @@ void NPCManager::sendToViewable(Entity *npc, void *buf, uint32_t type, size_t si
 static void npcBarkHandler(CNSocket* sock, CNPacketData* data) {
    sP_CL2FE_REQ_BARKER* req = (sP_CL2FE_REQ_BARKER*)data->buf;

-    int taskID = req->iMissionTaskID;
-    // ignore req->iNPC_ID as it is often fixated on a single npc in the region
-
-    if (Missions::Tasks.find(taskID) == Missions::Tasks.end()) {
-        std::cout << "mission task not found: " << taskID << std::endl;
-        return;
+    // get bark IDs from task data
+    TaskData* td = Missions::Tasks[req->iMissionTaskID];
+    std::vector<int> barks;
+    for (int i = 0; i < 4; i++) {
+        if (td->task["m_iHBarkerTextID"][i] != 0) // non-zeroes only
+            barks.push_back(td->task["m_iHBarkerTextID"][i]);
    }

-    TaskData* td = Missions::Tasks[taskID];
-    auto& barks = td->task["m_iHBarkerTextID"];
-
-    Player* plr = PlayerManager::getPlayer(sock);
-    std::vector<std::pair<int32_t, int32_t>> npcLines;
-
-    for (Chunk* chunk : plr->viewableChunks) {
-        for (auto ent = chunk->entities.begin(); ent != chunk->entities.end(); ent++) {
-            if (ent->kind != EntityKind::SIMPLE_NPC)
-                continue;
-
-            BaseNPC* npc = (BaseNPC*)ent->getEntity();
-            if (npc->type < 0 || npc->type >= NPCData.size())
-                continue; // npc unknown ?!
-
-            int barkType = NPCData[npc->type]["m_iBarkerType"];
-            if (barkType < 1 || barkType > 4)
-                continue; // no barks
-
-            int barkID = barks[barkType - 1];
-            if (barkID == 0)
-                continue; // no barks
-
-            npcLines.push_back(std::make_pair(npc->id, barkID));
-        }
-    }
-
-    if (npcLines.size() == 0)
-        return; // totally no barks
-
-    auto& [npcID, missionStringID] = npcLines[Rand::rand(npcLines.size())];
+    if (barks.empty())
+        return; // no barks

    INITSTRUCT(sP_FE2CL_REP_BARKER, resp);
-    resp.iNPC_ID = npcID;
-    resp.iMissionStringID = missionStringID;
+    resp.iNPC_ID = req->iNPC_ID;
+    resp.iMissionStringID = barks[Rand::rand(barks.size())];
    sock->sendPacket(resp, P_FE2CL_REP_BARKER);
 }

@@ -151,15 +122,16 @@ static void npcUnsummonHandler(CNSocket* sock, CNPacketData* data) {
 }

 // type must already be checked and updateNPCPosition() must be called on the result
-BaseNPC *NPCManager::summonNPC(int spawnX, int spawnY, int spawnZ, uint64_t instance, int type, bool respawn, bool baseInstance) {
+BaseNPC *NPCManager::summonNPC(int x, int y, int z, uint64_t instance, int type, bool respawn, bool baseInstance) {
    uint64_t inst = baseInstance ? MAPNUM(instance) : instance;

+    //assert(nextId < INT32_MAX);
    int id = nextId--;
    int team = NPCData[type]["m_iTeam"];
    BaseNPC *npc = nullptr;

    if (team == 2) {
-        npc = new Mob(spawnX, spawnY, spawnZ, inst, type, NPCData[type], id);
+        npc = new Mob(x, y, z, inst, type, NPCData[type], id);

        // re-enable respawning, if desired
        ((Mob*)npc)->summoned = !respawn;
@@ -322,55 +294,57 @@ BaseNPC* NPCManager::getNearestNPC(std::set<Chunk*>* chunks, int X, int Y, int Z
    return npc;
 }

-// TODO: Move this to separate file in ai/ subdir when implementing more events
+// TODO: Move this to MobAI, possibly
 #pragma region NPCEvents

 // summon right arm and stage 2 body
-static void lordFuseStageTwo(CombatNPC *npc) {
+static void lordFuseStageTwo(CNSocket *sock, BaseNPC *npc) {
    Mob *oldbody = (Mob*)npc; // adaptium, stun
+    Player *plr = PlayerManager::getPlayer(sock);

    std::cout << "Lord Fuse stage two" << std::endl;

    // Fuse doesn't move
    // Blastons, Heal
-    Mob *newbody = (Mob*)NPCManager::summonNPC(oldbody->x, oldbody->y, oldbody->z, oldbody->instanceID, 2467);
+    Mob *newbody = (Mob*)NPCManager::summonNPC(oldbody->x, oldbody->y, oldbody->z, plr->instanceID, 2467);

    newbody->angle = oldbody->angle;
-    NPCManager::updateNPCPosition(newbody->id, newbody->spawnX, newbody->spawnY, newbody->spawnZ,
-        oldbody->instanceID, oldbody->angle);
+    NPCManager::updateNPCPosition(newbody->id, newbody->x, newbody->y, newbody->z,
+        plr->instanceID, oldbody->angle);

    // right arm, Adaptium, Stun
-    Mob *arm = (Mob*)NPCManager::summonNPC(oldbody->x - 600, oldbody->y, oldbody->z, oldbody->instanceID, 2469);
+    Mob *arm = (Mob*)NPCManager::summonNPC(oldbody->x - 600, oldbody->y, oldbody->z, plr->instanceID, 2469);

    arm->angle = oldbody->angle;
-    NPCManager::updateNPCPosition(arm->id, arm->spawnX, arm->spawnY, arm->spawnZ,
-        oldbody->instanceID, oldbody->angle);
+    NPCManager::updateNPCPosition(arm->id, arm->x, arm->y, arm->z,
+        plr->instanceID, oldbody->angle);
 }

 // summon left arm and stage 3 body
-static void lordFuseStageThree(CombatNPC *npc) {
+static void lordFuseStageThree(CNSocket *sock, BaseNPC *npc) {
    Mob *oldbody = (Mob*)npc;
+    Player *plr = PlayerManager::getPlayer(sock);

    std::cout << "Lord Fuse stage three" << std::endl;

    // Cosmix, Damage Point
-    Mob *newbody = (Mob*)NPCManager::summonNPC(oldbody->x, oldbody->y, oldbody->z, oldbody->instanceID, 2468);
+    Mob *newbody = (Mob*)NPCManager::summonNPC(oldbody->x, oldbody->y, oldbody->z, plr->instanceID, 2468);

    newbody->angle = oldbody->angle;
-    NPCManager::updateNPCPosition(newbody->id, newbody->spawnX, newbody->spawnY, newbody->spawnZ,
-        newbody->instanceID, oldbody->angle);
+    NPCManager::updateNPCPosition(newbody->id, newbody->x, newbody->y, newbody->z,
+        plr->instanceID, oldbody->angle);

    // Blastons, Heal
-    Mob *arm = (Mob*)NPCManager::summonNPC(oldbody->x + 600, oldbody->y, oldbody->z, oldbody->instanceID, 2470);
+    Mob *arm = (Mob*)NPCManager::summonNPC(oldbody->x + 600, oldbody->y, oldbody->z, plr->instanceID, 2470);

    arm->angle = oldbody->angle;
-    NPCManager::updateNPCPosition(arm->id, arm->spawnX, arm->spawnY, arm->spawnZ,
-        arm->instanceID, oldbody->angle);
+    NPCManager::updateNPCPosition(arm->id, arm->x, arm->y, arm->z,
+        plr->instanceID, oldbody->angle);
 }

 std::vector<NPCEvent> NPCManager::NPCEvents = {
-    NPCEvent(2466, AIState::DEAD, lordFuseStageTwo),
-    NPCEvent(2467, AIState::DEAD, lordFuseStageThree),
+    NPCEvent(2466, ON_KILLED, lordFuseStageTwo),
+    NPCEvent(2467, ON_KILLED, lordFuseStageThree),
 };

 #pragma endregion NPCEvents
--- a/src/NPCManager.hpp
+++ b/src/NPCManager.hpp
@@ -14,15 +14,20 @@

 #define RESURRECT_HEIGHT 400

-typedef void (*NPCEventHandler)(CombatNPC*);
+enum Trigger {
+    ON_KILLED,
+    ON_COMBAT
+};
+
+typedef void (*NPCEventHandler)(CNSocket*, BaseNPC*);

 struct NPCEvent {
    int32_t npcType;
-    AIState triggerState;
+    int trigger;
    NPCEventHandler handler;

-    NPCEvent(int32_t t, AIState tr, NPCEventHandler hndlr)
-        : npcType(t), triggerState(tr), handler(hndlr) {}
+    NPCEvent(int32_t t, int tr, NPCEventHandler hndlr)
+        : npcType(t), trigger(tr), handler(hndlr) {}
 };

 namespace NPCManager {
--- a/src/Nanos.cpp
+++ b/src/Nanos.cpp
@@ -110,7 +110,7 @@ void Nanos::summonNano(CNSocket *sock, int slot, bool silent) {
 }

 static void setNanoSkill(CNSocket* sock, sP_CL2FE_REQ_NANO_TUNE* skill) {
-    if (skill == nullptr || skill->iNanoID >= NANO_COUNT || skill->iNanoID < 0)
+    if (skill->iNanoID >= NANO_COUNT)
        return;

    Player *plr = PlayerManager::getPlayer(sock);
--- a/src/Player.hpp
+++ b/src/Player.hpp
@@ -72,8 +72,8 @@ struct Player : public Entity, public ICombatant {
    bool notify = false;
    bool hidden = false;
    bool unwarpable = false;
-    bool initialLoadDone = false;

+    bool buddiesSynced = false;
    int64_t buddyIDs[50] = {};
    bool isBuddyBlocked[50] = {};

--- a/src/PlayerManager.cpp
+++ b/src/PlayerManager.cpp
@@ -77,10 +77,7 @@ void PlayerManager::updatePlayerPosition(CNSocket* sock, int X, int Y, int Z, ui
    plr->x = X;
    plr->y = Y;
    plr->z = Z;
-    if (plr->instanceID != I) {
-        plr->instanceID = I;
-        plr->recallInstance = INSTANCE_OVERWORLD;
-    }
+    plr->instanceID = I;
    if (oldChunk == newChunk)
        return; // didn't change chunks
    Chunking::updateEntityChunk({sock}, oldChunk, newChunk);
@@ -126,6 +123,24 @@ void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z, uint64_t I
        sock->sendPacket(resp, P_FE2CL_REP_PC_WARP_USE_NPC_SUCC);
    }

+    if (I != INSTANCE_OVERWORLD) {
+        INITSTRUCT(sP_FE2CL_INSTANCE_MAP_INFO, pkt);
+        pkt.iInstanceMapNum = (int32_t)MAPNUM(I); // lower 32 bits are mapnum
+        if (I != fromInstance // do not retransmit MAP_INFO on recall
+        && Racing::EPData.find(pkt.iInstanceMapNum) != Racing::EPData.end()) {
+            EPInfo* ep = &Racing::EPData[pkt.iInstanceMapNum];
+            pkt.iEP_ID = ep->EPID;
+            pkt.iMapCoordX_Min = ep->zoneX * 51200;
+            pkt.iMapCoordX_Max = (ep->zoneX + 1) * 51200;
+            pkt.iMapCoordY_Min = ep->zoneY * 51200;
+            pkt.iMapCoordY_Max = (ep->zoneY + 1) * 51200;
+            pkt.iMapCoordZ_Min = INT32_MIN;
+            pkt.iMapCoordZ_Max = INT32_MAX;
+        }
+
+        sock->sendPacket(pkt, P_FE2CL_INSTANCE_MAP_INFO);
+    }
+
    INITSTRUCT(sP_FE2CL_REP_PC_GOTO_SUCC, pkt2);
    pkt2.iX = X;
    pkt2.iY = Y;
@@ -155,21 +170,16 @@ void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z) {
 * Nanos the player hasn't unlocked will (and should) be greyed out. Thus, all nanos should be accounted
 * for in these packets, even if the player hasn't unlocked them.
 */
-static void sendNanoBook(CNSocket *sock, Player *plr, bool resizeOnly) {
+static void sendNanoBookSubset(CNSocket *sock) {
 #ifdef ACADEMY
+    Player *plr = getPlayer(sock);
+
    int16_t id = 0;
    INITSTRUCT(sP_FE2CL_REP_NANO_BOOK_SUBSET, pkt);

    pkt.PCUID = plr->iID;
    pkt.bookSize = NANO_COUNT;

-    if (resizeOnly) {
-        // triggers nano array resizing without
-        // actually sending nanos
-        sock->sendPacket(pkt, P_FE2CL_REP_NANO_BOOK_SUBSET);
-        return;
-    }
-
    while (id < NANO_COUNT) {
        pkt.elementOffset = id;

@@ -217,7 +227,6 @@ static void enterPlayer(CNSocket* sock, CNPacketData* data) {

    response.iID = plr->iID;
    response.uiSvrTime = getTime();
-
    response.PCLoadData2CL.iUserLevel = plr->accountLevel;
    response.PCLoadData2CL.iHP = plr->HP;
    response.PCLoadData2CL.iLevel = plr->level;
@@ -300,21 +309,27 @@ static void enterPlayer(CNSocket* sock, CNPacketData* data) {
    sock->setFEKey(lm->FEKey);
    sock->setActiveKey(SOCKETKEY_FE); // send all packets using the FE key from now on

-    // Academy builds receive nanos in a separate packet. An initial one with the size of the
-    // nano book needs to be sent before PC_ENTER_SUCC so the client can resize its nano arrays,
-    // and then proper packets with the nanos included must be sent after, while the game is loading.
-    sendNanoBook(sock, plr, true);
-
    sock->sendPacket(response, P_FE2CL_REP_PC_ENTER_SUCC);

-    sendNanoBook(sock, plr, false);
+    // transmit MOTD after entering the game, so the client hopefully changes modes on time
+    Chat::sendServerMessage(sock, settings::MOTDSTRING);

    // transfer ownership of Player object into the shard (still valid in this function though)
    addPlayer(sock, plr);

+    // check if there is an expiring vehicle
+    Items::checkItemExpire(sock, plr);
+
    // set player equip stats
    Items::setItemStats(plr);

+    Missions::failInstancedMissions(sock);
+
+    sendNanoBookSubset(sock);
+
+    // initial buddy sync
+    Buddies::refreshBuddyList(sock);
+
    for (auto& pair : players)
        if (pair.second->notify)
            Chat::sendServerMessage(pair.first, "[ADMIN]" + getPlayerName(plr) + " has joined.");
@@ -359,35 +374,6 @@ static void loadPlayer(CNSocket* sock, CNPacketData* data) {
    updatePlayerPosition(sock, plr->x, plr->y, plr->z, plr->instanceID, plr->angle);

    sock->sendPacket(response, P_FE2CL_REP_PC_LOADING_COMPLETE_SUCC);
-
-    if (plr->instanceID != INSTANCE_OVERWORLD) {
-        INITSTRUCT(sP_FE2CL_INSTANCE_MAP_INFO, pkt);
-        pkt.iInstanceMapNum = (int32_t)MAPNUM(plr->instanceID); // lower 32 bits are mapnum
-        if (pkt.iInstanceMapNum != plr->recallInstance // do not retransmit MAP_INFO on recall
-        && Racing::EPData.find(pkt.iInstanceMapNum) != Racing::EPData.end()) {
-            EPInfo* ep = &Racing::EPData[pkt.iInstanceMapNum];
-            pkt.iEP_ID = ep->EPID;
-            pkt.iMapCoordX_Min = ep->zoneX * 51200;
-            pkt.iMapCoordX_Max = (ep->zoneX + 1) * 51200;
-            pkt.iMapCoordY_Min = ep->zoneY * 51200;
-            pkt.iMapCoordY_Max = (ep->zoneY + 1) * 51200;
-            pkt.iMapCoordZ_Min = INT32_MIN;
-            pkt.iMapCoordZ_Max = INT32_MAX;
-        }
-
-        sock->sendPacket(pkt, P_FE2CL_INSTANCE_MAP_INFO);
-    }
-
-    if (!plr->initialLoadDone) {
-        // these should be called only once, but not until after
-        // first load-in or else the client may ignore the packets
-        Chat::sendServerMessage(sock, settings::MOTDSTRING); // MOTD
-        Missions::failInstancedMissions(sock); // auto-fail missions
-        Buddies::sendBuddyList(sock); // buddy list
-        Items::checkItemExpire(sock, plr); // vehicle expiration
-
-        plr->initialLoadDone = true;
-    }
 }

 static void heartbeatPlayer(CNSocket* sock, CNPacketData* data) {
@@ -396,14 +382,6 @@ static void heartbeatPlayer(CNSocket* sock, CNPacketData* data) {

 static void exitGame(CNSocket* sock, CNPacketData* data) {
    auto exitData = (sP_CL2FE_REQ_PC_EXIT*)data->buf;
-
-    // Refresh any auth cookie, in case "change character" was used
-    Player* plr = getPlayer(sock);
-    if (plr != nullptr) {
-        // 5 seconds should be enough to log in again
-        Database::refreshCookie(plr->accountId, 5);
-    }
-
    INITSTRUCT(sP_FE2CL_REP_PC_EXIT_SUCC, response);

    response.iID = exitData->iID;
@@ -599,7 +577,7 @@ static void setFirstUseFlag(CNSocket* sock, CNPacketData* data) {
        std::cout << "[WARN] Client submitted invalid first use flag number?!" << std::endl;
        return;
    }
-
+    
    if (flag->iFlagCode <= 64)
        plr->iFirstUseFlag[0] |= (1ULL << (flag->iFlagCode - 1));
    else
@@ -620,10 +598,6 @@ std::string PlayerManager::getPlayerName(Player *plr, bool id) {
    if (plr == nullptr)
        return "NOT IN GAME";

-    if (plr->PCStyle.iNameCheck != 1) {
-        return "Player " + std::to_string(plr->iID);
-    }
-
    std::string ret = "";
    if (id && plr->accountLevel <= 30)
        ret += "(GM) ";
--- a/src/Racing.cpp
+++ b/src/Racing.cpp
@@ -66,7 +66,7 @@ static void racingCancel(CNSocket* sock, CNPacketData* data) {
    INITSTRUCT(sP_FE2CL_REP_EP_RACE_CANCEL_SUCC, resp);
    sock->sendPacket(resp, P_FE2CL_REP_EP_RACE_CANCEL_SUCC);

-    /*
+    /* 
     * This request packet is used for both cancelling the race via the
     * NPC at the start, *and* failing the race by running out of time.
     * If the latter is to happen, the client disables movement until it
@@ -99,43 +99,35 @@ static void racingEnd(CNSocket* sock, CNPacketData* data) {
    if (EPData.find(mapNum) == EPData.end() || EPData[mapNum].EPID == 0)
        return; // IZ not found

-    EPInfo& epInfo = EPData[mapNum];
-    EPRace& epRace = EPRaces[sock];
-
    uint64_t now = getTime() / 1000;
-    int timeDiff = now - epRace.startTime;
-    int podsCollected = epRace.collectedRings.size();

-    int score = std::exp(
-        (epInfo.podFactor * podsCollected) / epInfo.maxPods
-        - (epInfo.timeFactor * timeDiff) / epInfo.maxTime
-        + epInfo.scaleFactor);
-    score = (settings::IZRACESCORECAPPED && score > epInfo.maxScore) ? epInfo.maxScore : score;
-    int fm = (1.0 + std::exp(epInfo.scaleFactor - 1.0) * epInfo.podFactor * podsCollected) / epInfo.maxPods;
+    int timeDiff = now - EPRaces[sock].startTime;
+    int score = 500 * EPRaces[sock].collectedRings.size() - 10 * timeDiff;
+    if (score < 0) score = 0; // lol
+    int fm = score * plr->level * (1.0f / 36) * 0.3f;

    // we submit the ranking first...
    Database::RaceRanking postRanking = {};
-    postRanking.EPID = epInfo.EPID;
+    postRanking.EPID = EPData[mapNum].EPID;
    postRanking.PlayerID = plr->iID;
-    postRanking.RingCount = podsCollected;
+    postRanking.RingCount = EPRaces[sock].collectedRings.size();
    postRanking.Score = score;
    postRanking.Time = timeDiff;
    postRanking.Timestamp = getTimestamp();
    Database::postRaceRanking(postRanking);

    // ...then we get the top ranking, which may or may not be what we just submitted
-    Database::RaceRanking topRankingPlayer = Database::getTopRaceRanking(epInfo.EPID, plr->iID);
+    Database::RaceRanking topRankingPlayer = Database::getTopRaceRanking(EPData[mapNum].EPID, plr->iID);

    INITSTRUCT(sP_FE2CL_REP_EP_RACE_END_SUCC, resp);

    // get rank scores and rewards
-    std::vector<int>* rankScores = &EPRewards[epInfo.EPID].first;
-    std::vector<int>* rankRewards = &EPRewards[epInfo.EPID].second;
+    std::vector<int>* rankScores = &EPRewards[EPData[mapNum].EPID].first;
+    std::vector<int>* rankRewards = &EPRewards[EPData[mapNum].EPID].second;

    // top ranking
-    int maxRank = rankScores->size() - 1;
    int topRank = 0;
-    while (topRank < maxRank && rankScores->at(topRank) > topRankingPlayer.Score)
+    while (rankScores->at(topRank) > topRankingPlayer.Score)
        topRank++;

    resp.iEPTopRank = topRank + 1;
@@ -145,7 +137,7 @@ static void racingEnd(CNSocket* sock, CNPacketData* data) {

    // this ranking
    int rank = 0;
-    while (rank < maxRank && rankScores->at(rank) > postRanking.Score)
+    while (rankScores->at(rank) > postRanking.Score)
        rank++;

    resp.iEPRank = rank + 1;
--- a/src/Racing.hpp
+++ b/src/Racing.hpp
@@ -7,11 +7,7 @@
 #include <set>

 struct EPInfo {
-    // available through XDT (maxScore may be updated by drops)
-    int zoneX, zoneY, EPID, maxScore;
-    // available through drops
-    int maxTime, maxPods;
-    double scaleFactor, podFactor, timeFactor;
+    int zoneX, zoneY, EPID, maxScore, maxTime;
 };

 struct EPRace {
--- a/src/TableData.cpp
+++ b/src/TableData.cpp
@@ -1,7 +1,5 @@
 #include "TableData.hpp"

-#include "servers/CNLoginServer.hpp"
-
 #include "NPCManager.hpp"
 #include "Missions.hpp"
 #include "Items.hpp"
@@ -81,25 +79,6 @@ static void loadXDT(json& xdtData) {
    NPCManager::NPCData = xdtData["m_pNpcTable"]["m_pNpcData"];

    try {
-        // load name wheel names
-        json firstNameData = xdtData["m_pNameTable"]["m_pFirstName"];
-        for (json::iterator _name = firstNameData.begin(); _name != firstNameData.end(); _name++) {
-            auto name = _name.value();
-            LoginServer::WheelFirstNames.push_back(name["m_pstrNameString"]);
-        }
-
-        json middleNameData = xdtData["m_pNameTable"]["m_pMiddleName"];
-        for (json::iterator _name = middleNameData.begin(); _name != middleNameData.end(); _name++) {
-            auto name = _name.value();
-            LoginServer::WheelMiddleNames.push_back(name["m_pstrNameString"]);
-        }
-
-        json lastNameData = xdtData["m_pNameTable"]["m_pLastName"];
-        for (json::iterator _name = lastNameData.begin(); _name != lastNameData.end(); _name++) {
-            auto name = _name.value();
-            LoginServer::WheelLastNames.push_back(name["m_pstrNameString"]);
-        }
-
        // load warps
        json warpData = xdtData["m_pInstanceTable"]["m_pWarpData"];

@@ -396,7 +375,7 @@ static void loadPaths(json& pathData, int32_t* nextId) {
            Transport::NPCPaths.push_back(pathTemplate);
        }
        std::cout << "[INFO] Loaded " << Transport::NPCPaths.size() << " NPC paths" << std::endl;
-
+        
    }
    catch (const std::exception& err) {
        std::cerr << "[FATAL] Malformed paths.json file! Reason:" << err.what() << std::endl;
@@ -605,17 +584,8 @@ static void loadDrops(json& dropData) {
                continue;
            }

-            EPInfo& epInfo = Racing::EPData[EPMap];
-
-            // max score is specified in the XDT, but can be updated if specified in the drops JSON
-            epInfo.maxScore = (int)race["ScoreCap"];
-            // time limit and total pods are not stored in the XDT, so we include it in the drops JSON
-            epInfo.maxTime = (int)race["TimeLimit"];
-            epInfo.maxPods = (int)race["TotalPods"];
-            // IZ-specific calculated constants included in the drops JSON
-            epInfo.scaleFactor = (double)race["ScaleFactor"];
-            epInfo.podFactor = (double)race["PodFactor"];
-            epInfo.timeFactor = (double)race["TimeFactor"];
+            // time limit isn't stored in the XDT, so we include it in the reward table instead
+            Racing::EPData[EPMap].maxTime = race["TimeLimit"];

            // score cutoffs
            std::vector<int> rankScores;
@@ -631,7 +601,7 @@ static void loadDrops(json& dropData) {

            if (rankScores.size() != 5 || rankScores.size() != rankRewards.size()) {
                char buff[255];
-                snprintf(buff, 255, "Race in EP %d doesn't have exactly 5 score/reward pairs", raceEPID);
+                sprintf(buff, "Race in EP %d doesn't have exactly 5 score/reward pairs", raceEPID);
                throw TableException(std::string(buff));
            }

@@ -716,7 +686,7 @@ static void loadEggs(json& eggData, int32_t* nextId) {
    }
 }

-/*
+/* 
 * Load gruntwork output, if it exists
 */
 static void loadGruntworkPre(json& gruntwork, int32_t* nextId) {
@@ -1391,7 +1361,7 @@ void TableData::flush() {
            targetIDs.push_back(tID);
        for (int32_t tType : path.targetTypes)
            targetTypes.push_back(tType);
-
+        
        pathObj["iBaseSpeed"] = path.speed;
        pathObj["iTaskID"] = path.escortTaskID;
        pathObj["bRelative"] = path.isRelative;
--- a/src/Trading.cpp
+++ b/src/Trading.cpp
@@ -186,36 +186,6 @@ static void tradeOfferRefusal(CNSocket* sock, CNPacketData* data) {
    otherSock->sendPacket((void*)&resp, P_FE2CL_REP_PC_TRADE_OFFER_REFUSAL, sizeof(sP_FE2CL_REP_PC_TRADE_OFFER_REFUSAL));
 }

-static void tradeOfferCancel(CNSocket* sock, CNPacketData* data) {
-    sP_CL2FE_REQ_PC_TRADE_OFFER_CANCEL* pacdat = (sP_CL2FE_REQ_PC_TRADE_OFFER_CANCEL*)data->buf;
-
-    CNSocket* otherSock = PlayerManager::getSockFromID(pacdat->iID_From);
-
-    if (otherSock == nullptr)
-        return;
-
-    INITSTRUCT(sP_FE2CL_REP_PC_TRADE_OFFER_CANCEL, resp);
-    resp.iID_Request = pacdat->iID_Request;
-    resp.iID_From = pacdat->iID_From;
-    resp.iID_To = pacdat->iID_To;
-    otherSock->sendPacket((void*)&resp, P_FE2CL_REP_PC_TRADE_OFFER_CANCEL, sizeof(sP_FE2CL_REP_PC_TRADE_OFFER_CANCEL));
-}
-
-static void tradeOfferAbort(CNSocket* sock, CNPacketData* data) {
-    sP_CL2FE_REQ_PC_TRADE_OFFER_ABORT* pacdat = (sP_CL2FE_REQ_PC_TRADE_OFFER_ABORT*)data->buf;
-
-    CNSocket* otherSock = PlayerManager::getSockFromID(pacdat->iID_From);
-
-    if (otherSock == nullptr)
-        return;
-
-    INITSTRUCT(sP_FE2CL_REP_PC_TRADE_OFFER_ABORT, resp);
-    resp.iID_Request = pacdat->iID_Request;
-    resp.iID_From = pacdat->iID_From;
-    resp.iID_To = pacdat->iID_To;
-    otherSock->sendPacket((void*)&resp, P_FE2CL_REP_PC_TRADE_OFFER_ABORT, sizeof(sP_FE2CL_REP_PC_TRADE_OFFER_ABORT));
-}
-
 static void tradeConfirm(CNSocket* sock, CNPacketData* data) {
    sP_CL2FE_REQ_PC_TRADE_CONFIRM* pacdat = (sP_CL2FE_REQ_PC_TRADE_CONFIRM*)data->buf;

@@ -460,8 +430,6 @@ void Trading::init() {
    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_OFFER, tradeOffer);
    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_OFFER_ACCEPT, tradeOfferAccept);
    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_OFFER_REFUSAL, tradeOfferRefusal);
-    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_OFFER_CANCEL, tradeOfferCancel);
-    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_OFFER_ABORT, tradeOfferAbort);
    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_CONFIRM, tradeConfirm);
    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_CONFIRM_CANCEL, tradeConfirmCancel);
    REGISTER_SHARD_PACKET(P_CL2FE_REQ_PC_TRADE_ITEM_REGISTER, tradeRegisterItem);
--- a/src/Transport.cpp
+++ b/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
--- a/src/core/CNProtocol.cpp
+++ b/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);
--- a/src/core/CNProtocol.hpp
+++ b/src/core/CNProtocol.hpp
@@ -95,14 +95,14 @@ inline constexpr bool isOutboundPacketID(uint32_t id) {
 // for outbound packets
 inline constexpr bool validOutVarPacket(size_t base, size_t npayloads, size_t plsize) {
    // check for multiplication overflow
-    if (npayloads > 0 && (CN_PACKET_BODY_SIZE) / (size_t)npayloads < plsize)
+    if (npayloads > 0 && (CN_PACKET_BUFFER_SIZE - 8) / (size_t)npayloads < plsize)
        return false;

    // it's safe to multiply
    size_t trailing = npayloads * plsize;

    // does it fit in a packet?
-    if (base + trailing > CN_PACKET_BODY_SIZE)
+    if (base + trailing > CN_PACKET_BUFFER_SIZE - 8)
        return false;

    // everything is a-ok!
@@ -112,14 +112,14 @@ inline constexpr bool validOutVarPacket(size_t base, size_t npayloads, size_t pl
 // for inbound packets
 inline constexpr bool validInVarPacket(size_t base, size_t npayloads, size_t plsize, size_t datasize) {
    // check for multiplication overflow
-    if (npayloads > 0 && CN_PACKET_BODY_SIZE / (size_t)npayloads < plsize)
+    if (npayloads > 0 && (CN_PACKET_BUFFER_SIZE - 8) / (size_t)npayloads < plsize)
        return false;

    // it's safe to multiply
    size_t trailing = npayloads * plsize;

    // make sure size is exact
-    // datasize has already been validated against CN_PACKET_BODY_SIZE
+    // datasize has already been validated against CN_PACKET_BUFFER_SIZE
    if (datasize != base + trailing)
        return false;

--- a/src/core/CNStructs.hpp
+++ b/src/core/CNStructs.hpp
@@ -29,8 +29,8 @@
 #define INITSTRUCT(T, x) T x; \
    memset(&x, 0, sizeof(T));

-#define INITVARPACKET(_buf, _Pkt, _pkt, _Trailer, _trailer) uint8_t _buf[CN_PACKET_BODY_SIZE]; \
-    memset(&_buf, 0, CN_PACKET_BODY_SIZE); \
+#define INITVARPACKET(_buf, _Pkt, _pkt, _Trailer, _trailer) uint8_t _buf[CN_PACKET_BUFFER_SIZE]; \
+    memset(&_buf, 0, CN_PACKET_BUFFER_SIZE); \
    auto _pkt = (_Pkt*)_buf; \
    auto _trailer = (_Trailer*)(_pkt + 1);

@@ -40,7 +40,6 @@

 // wrapper for U16toU8
 #define ARRLEN(x) (sizeof(x)/sizeof(*x))
-#define AUTOU8(x) std::string((char*)x, ARRLEN(x))
 #define AUTOU16TOU8(x) U16toU8(x, ARRLEN(x)) 

 // TODO: rewrite U16toU8 & U8toU16 to not use codecvt
@@ -49,18 +48,15 @@ std::string U16toU8(char16_t* src, size_t max);
 size_t U8toU16(std::string src, char16_t* des, size_t max); // returns number of char16_t that was written at des
 time_t getTime();
 time_t getTimestamp();
-int timingSafeStrcmp(const char* a, const char* b);
 void terminate(int);

-// The PROTOCOL_VERSION definition can be defined by the build system.
+// The PROTOCOL_VERSION definition is defined by the build system.
 #if !defined(PROTOCOL_VERSION)
-    #define PROTOCOL_VERSION 104
-#endif
-
-#if PROTOCOL_VERSION == 104
    #include "structs/0104.hpp"
 #elif PROTOCOL_VERSION == 728
    #include "structs/0728.hpp"
+#elif PROTOCOL_VERSION == 104
+    #include "structs/0104.hpp"
 #elif PROTOCOL_VERSION == 1013
    #include "structs/1013.hpp"
 #else
--- a/src/core/Defines.hpp
+++ b/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
@@ -942,8 +934,3 @@ enum {

    N_PACKETS = N_CL2LS + N_CL2FE + N_FE2CL + N_LS2CL
 };
-
-/*
- * Usable space in the packet buffer = CN_PACKET_BUFFER_SIZE - type - size
- */
-constexpr size_t CN_PACKET_BODY_SIZE = CN_PACKET_BUFFER_SIZE - 2 * sizeof(int32_t);
--- a/src/core/Packets.cpp
+++ b/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),
--- a/src/db/Database.hpp
+++ b/src/db/Database.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>

-#define DATABASE_VERSION 6
+#define DATABASE_VERSION 4

 namespace Database {

@@ -46,18 +46,9 @@ namespace Database {
    void close();

    void findAccount(Account* account, std::string login);
-
-    // return ID, 0 if something failed
-    int getAccountIdForPlayer(int playerId);
+    // returns ID, 0 if something failed
    int addAccount(std::string login, std::string password);

-    void updateAccountLevel(int accountId, int accountLevel);
-
-    // return true if cookie is valid for the account.
-    // invalidates the stored cookie afterwards
-    bool checkCookie(int accountId, const char *cookie);
-    void refreshCookie(int accountId, int durationSec);
-
    // interface for the /ban command
    bool banPlayer(int playerId, std::string& reason);
    bool unbanPlayer(int playerId);
@@ -69,7 +60,7 @@ namespace Database {
    bool isNameFree(std::string firstName, std::string lastName);
    bool isSlotFree(int accountId, int slotNum);
    /// returns ID, 0 if something failed
-    int createCharacter(int slot, int accountId, const char* firstName, const char* lastName, int nameCheck);
+    int createCharacter(sP_CL2LS_REQ_SAVE_CHAR_NAME* save, int AccountID);
    /// returns true if query succeeded
    bool finishCharacter(sP_CL2LS_REQ_CHAR_CREATE* character, int accountId);
    /// returns true if query succeeded
@@ -85,7 +76,7 @@ namespace Database {
    };
    void evaluateCustomName(int characterID, CustomName decision);
    /// returns true if query succeeded
-    bool changeName(int playerId, int accountId, const char* firstName, const char* lastName, int nameCheck);
+    bool changeName(sP_CL2LS_REQ_CHANGE_CHAR_NAME* save, int accountId);

    // getting players
    void getPlayer(Player* plr, int id);
--- a/src/db/init.cpp
+++ b/src/db/init.cpp
@@ -226,11 +226,10 @@ static void createTables() {
 static int getTableSize(std::string tableName) {
    std::lock_guard<std::mutex> lock(dbCrit); // XXX

-    // you aren't allowed to bind the table name
-    const char* sql = "SELECT COUNT(*) FROM ";
-    tableName.insert(0, sql);
+    const char* sql = "SELECT COUNT(*) FROM ?";
    sqlite3_stmt* stmt;
-    sqlite3_prepare_v2(db, tableName.c_str(), -1, &stmt, NULL);
+    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
+    sqlite3_bind_text(stmt, 1, tableName.c_str(), -1, NULL);
    sqlite3_step(stmt);
    int result = sqlite3_column_int(stmt, 0);
    sqlite3_finalize(stmt);
@@ -267,17 +266,17 @@ void Database::open() {
    checkMetaTable();
    createTables();

-    std::cout << "[INFO] Database in operation";
+    std::cout << "[INFO] Database in operation ";
    int accounts = getTableSize("Accounts");
    int players = getTableSize("Players");
    std::string message = "";
    if (accounts > 0) {
-        message += ": Found " + std::to_string(accounts) + " account";
+        message += ": Found " + std::to_string(accounts) + " Account";
        if (accounts > 1)
            message += "s";
    }
    if (players > 0) {
-        message += " and " + std::to_string(players) + " player";
+        message += " and " + std::to_string(players) + " Player Character";
        if (players > 1)
            message += "s";
    }
--- a/src/db/login.cpp
+++ b/src/db/login.cpp
@@ -1,9 +1,5 @@
-#include "core/CNStructs.hpp"
-
 #include "db/internal.hpp"

-#include "servers/CNLoginServer.hpp"
-
 #include "bcrypt/BCrypt.hpp"

 void Database::findAccount(Account* account, std::string login) {
@@ -31,32 +27,6 @@ void Database::findAccount(Account* account, std::string login) {
    sqlite3_finalize(stmt);
 }

-int Database::getAccountIdForPlayer(int playerId) {
-    std::lock_guard<std::mutex> lock(dbCrit);
-
-    const char* sql = R"(
-        SELECT AccountID
-        FROM Players
-        WHERE PlayerID = ?
-        LIMIT 1;
-        )";
-    sqlite3_stmt* stmt;
-
-    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
-    sqlite3_bind_int(stmt, 1, playerId);
-
-    int rc = sqlite3_step(stmt);
-    if (rc != SQLITE_ROW) {
-        std::cout << "[WARN] Database: couldn't get account id for player " << playerId << std::endl;
-        sqlite3_finalize(stmt);
-        return 0;
-    }
-
-    int accountId = sqlite3_column_int(stmt, 0);
-    sqlite3_finalize(stmt);
-    return accountId;
-}
-
 int Database::addAccount(std::string login, std::string password) {
    std::lock_guard<std::mutex> lock(dbCrit);

@@ -82,98 +52,6 @@ int Database::addAccount(std::string login, std::string password) {
    return sqlite3_last_insert_rowid(db);
 }

-void Database::updateAccountLevel(int accountId, int accountLevel) {
-    std::lock_guard<std::mutex> lock(dbCrit);
-
-    const char* sql = R"(
-        UPDATE Accounts SET
-            AccountLevel = ?
-        WHERE AccountID = ?;
-        )";
-    sqlite3_stmt* stmt;
-
-    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
-    sqlite3_bind_int(stmt, 1, accountLevel);
-    sqlite3_bind_int(stmt, 2, accountId);
-
-    int rc = sqlite3_step(stmt);
-    if (rc != SQLITE_DONE)
-        std::cout << "[WARN] Database fail on updateAccountLevel(): " << sqlite3_errmsg(db) << std::endl;
-    sqlite3_finalize(stmt);
-}
-
-bool Database::checkCookie(int accountId, const char *tryCookie) {
-    std::lock_guard<std::mutex> lock(dbCrit);
-
-    const char* sql_get = R"(
-        SELECT Cookie
-        FROM Auth
-        WHERE AccountID = ? AND Expires > ?;
-        )";
-
-    const char* sql_invalidate = R"(
-        UPDATE Auth
-        SET Expires = 0
-        WHERE AccountID = ?;
-        )";
-
-    sqlite3_stmt* stmt;
-
-    sqlite3_prepare_v2(db, sql_get, -1, &stmt, NULL);
-    sqlite3_bind_int(stmt, 1, accountId);
-    sqlite3_bind_int(stmt, 2, getTimestamp());
-    int rc = sqlite3_step(stmt);
-    if (rc != SQLITE_ROW) {
-        sqlite3_finalize(stmt);
-        return false;
-    }
-
-    const char *cookie = reinterpret_cast<const char*>(sqlite3_column_text(stmt, 0));
-    if (strlen(cookie) != strlen(tryCookie)) {
-        sqlite3_finalize(stmt);
-        return false;
-    }
-
-    bool match = (timingSafeStrcmp(cookie, tryCookie) == 0);
-    sqlite3_finalize(stmt);
-
-    /*
-     * Only invalidate the cookie if it was correct. This prevents
-     * replay attacks without enabling DOS attacks on accounts.
-     */
-    if (match) {
-        sqlite3_prepare_v2(db, sql_invalidate, -1, &stmt, NULL);
-        sqlite3_bind_int(stmt, 1, accountId);
-        rc = sqlite3_step(stmt);
-        sqlite3_finalize(stmt);
-        if (rc != SQLITE_DONE)
-            std::cout << "[WARN] Database fail on checkCookie(): " << sqlite3_errmsg(db) << std::endl;
-    }
-
-    return match;
-}
-
-void Database::refreshCookie(int accountId, int durationSec) {
-    std::lock_guard<std::mutex> lock(dbCrit);
-
-    const char* sql = R"(
-        UPDATE Auth
-        SET Expires = ?
-        WHERE AccountID = ?;
-        )";
-    
-    int expires = getTimestamp() + durationSec;
-
-    sqlite3_stmt* stmt;
-    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
-    sqlite3_bind_int(stmt, 1, expires);
-    sqlite3_bind_int(stmt, 2, accountId);
-    int rc = sqlite3_step(stmt);
-    sqlite3_finalize(stmt);
-    if (rc != SQLITE_DONE)
-        std::cout << "[WARN] Database fail on refreshCookie(): " << sqlite3_errmsg(db) << std::endl;
-}
-
 void Database::updateSelected(int accountId, int slot) {
    std::lock_guard<std::mutex> lock(dbCrit);

@@ -293,7 +171,7 @@ bool Database::isSlotFree(int accountId, int slotNum) {
    return result;
 }

-int Database::createCharacter(int slot, int accountId, const char* firstName, const char* lastName, int nameCheck) {
+int Database::createCharacter(sP_CL2LS_REQ_SAVE_CHAR_NAME* save, int AccountID) {
    std::lock_guard<std::mutex> lock(dbCrit);

    sqlite3_exec(db, "BEGIN TRANSACTION;", NULL, NULL, NULL);
@@ -306,17 +184,22 @@ int Database::createCharacter(int slot, int accountId, const char* firstName, co
        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
        )";
    sqlite3_stmt* stmt;
+    std::string firstName = AUTOU16TOU8(save->szFirstName);
+    std::string lastName =  AUTOU16TOU8(save->szLastName);

    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
-    sqlite3_bind_int(stmt, 1, accountId);
-    sqlite3_bind_int(stmt, 2, slot);
-    sqlite3_bind_text(stmt, 3, firstName, -1, NULL);
-    sqlite3_bind_text(stmt, 4, lastName, -1, NULL);
+    sqlite3_bind_int(stmt, 1, AccountID);
+    sqlite3_bind_int(stmt, 2, save->iSlotNum);
+    sqlite3_bind_text(stmt, 3, firstName.c_str(), -1, NULL);
+    sqlite3_bind_text(stmt, 4, lastName.c_str(), -1, NULL);
    sqlite3_bind_int(stmt, 5, settings::SPAWN_X);
    sqlite3_bind_int(stmt, 6, settings::SPAWN_Y);
    sqlite3_bind_int(stmt, 7, settings::SPAWN_Z);
    sqlite3_bind_int(stmt, 8, settings::SPAWN_ANGLE);
    sqlite3_bind_int(stmt, 9, PC_MAXHEALTH(1));
+
+    // if FNCode isn't 0, it's a wheel name
+    int nameCheck = (settings::APPROVEALLNAMES || save->iFNCode) ? 1 : 0;
    sqlite3_bind_int(stmt, 10, nameCheck);

    // blobs
@@ -645,7 +528,7 @@ void Database::evaluateCustomName(int characterID, CustomName decision) {
    sqlite3_finalize(stmt);
 }

-bool Database::changeName(int playerId, int accountId, const char* firstName, const char* lastName, int nameCheck) {
+bool Database::changeName(sP_CL2LS_REQ_CHANGE_CHAR_NAME* save, int accountId) {
    std::lock_guard<std::mutex> lock(dbCrit);

    const char* sql = R"(
@@ -659,10 +542,15 @@ bool Database::changeName(int playerId, int accountId, const char* firstName, co
    sqlite3_stmt* stmt;
    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);

-    sqlite3_bind_text(stmt, 1, firstName, -1, NULL);
-    sqlite3_bind_text(stmt, 2, lastName, -1, NULL);
+    std::string firstName = AUTOU16TOU8(save->szFirstName);
+    std::string lastName = AUTOU16TOU8(save->szLastName);
+
+    sqlite3_bind_text(stmt, 1, firstName.c_str(), -1, NULL);
+    sqlite3_bind_text(stmt, 2, lastName.c_str(), -1, NULL);
+    // if FNCode isn't 0, it's a wheel name
+    int nameCheck = (settings::APPROVEALLNAMES || save->iFNCode) ? 1 : 0;
    sqlite3_bind_int(stmt, 3, nameCheck);
-    sqlite3_bind_int(stmt, 4, playerId);
+    sqlite3_bind_int(stmt, 4, save->iPCUID);
    sqlite3_bind_int(stmt, 5, accountId);

    int rc = sqlite3_step(stmt);
--- a/src/db/shard.cpp
+++ b/src/db/shard.cpp
@@ -208,8 +208,6 @@ void Database::addBlock(int playerId, int blockedPlayerId) {
 }

 void Database::removeBlock(int playerId, int blockedPlayerId) {
-    std::lock_guard<std::mutex> lock(dbCrit);
-
    const char* sql = R"(
        DELETE FROM Blocks
        WHERE PlayerID = ? AND BlockedPlayerID = ?;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,7 +49,6 @@ CNShardServer *shardServer = nullptr;
 std::thread *shardThread = nullptr;

 void startShard(CNShardServer* server) {
-    sandbox_thread_start();
    server->start();
 }

@@ -65,7 +64,7 @@ void terminate(int arg) {
 }

 #ifdef _WIN32
-static BOOL WINAPI winTerminate(DWORD arg) {
+static BOOL winTerminate(DWORD arg) {
    terminate(0);
    return FALSE;
 }
@@ -151,8 +150,6 @@ int main() {
        /* not reached */
    }

-    sandbox_init();
-
    std::cout << "[INFO] Starting Server Threads..." << std::endl;
    CNLoginServer loginServer(settings::LOGINPORT);
    shardServer = new CNShardServer(settings::SHARDPORT);
@@ -160,7 +157,6 @@ int main() {
    shardThread = new std::thread(startShard, (CNShardServer*)shardServer);

    sandbox_start();
-    sandbox_thread_start();

    loginServer.start();

@@ -222,17 +218,6 @@ time_t getTimestamp() {
    return (time_t)value.count();
 }

-// timing safe strcmp implementation for e.g. cookie validation
-int timingSafeStrcmp(const char* a, const char* b) {
-    int diff = 0;
-    while (*a && *b) {
-        diff |= *a++ ^ *b++;
-    }
-    diff |= *a;
-    diff |= *b;
-    return diff;
-}
-
 // convert integer timestamp (in s) to FF systime struct
 sSYSTEMTIME timeStampToStruct(uint64_t time) {

--- a/src/sandbox/Sandbox.hpp
+++ b/src/sandbox/Sandbox.hpp
@@ -4,16 +4,11 @@
 #if defined(__linux__) || defined(__OpenBSD__)

 # if !defined(CONFIG_NOSANDBOX)
-void sandbox_init();
 void sandbox_start();
-void sandbox_thread_start();
 # else

 #include <iostream>

-inline void sandbox_init() {}
-inline void sandbox_thread_start() {}
-
 inline void sandbox_start() {
    std::cout << "[WARN] Built without a sandbox" << std::endl;
 }
@@ -22,7 +17,5 @@ inline void sandbox_start() {

 #else
 // stub for unsupported platforms
-inline void sandbox_init() {}
 inline void sandbox_start() {}
-inline void sandbox_thread_start() {}
 #endif
--- a/src/sandbox/openbsd.cpp
+++ b/src/sandbox/openbsd.cpp
@@ -13,9 +13,6 @@ static void eunveil(const char *path, const char *permissions) {
        err(1, "unveil");
 }

-void sandbox_init() {}
-void sandbox_thread_start() {}
-
 void sandbox_start() {
    /*
     * There shouldn't ever be a reason to disable this one, but might as well
--- a/src/sandbox/seccomp.cpp
+++ b/src/sandbox/seccomp.cpp
@@ -4,9 +4,6 @@
 #include "settings.hpp"

 #include <stdlib.h>
-#include <fcntl.h>
-
-#include <filesystem>

 #include <sys/prctl.h>
 #include <sys/ptrace.h>
@@ -20,10 +17,6 @@
 #include <linux/audit.h>
 #include <linux/net.h> // for socketcall() args

-#ifndef CONFIG_NOLANDLOCK
-#include <linux/landlock.h>
-#endif
-
 /*
 * Macros adapted from https://outflux.net/teach-seccomp/
 * Relevant license:
@@ -61,7 +54,7 @@
    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ERRNO|(_errno))

 #define KILL_PROCESS \
-    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_TRAP)
+    BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL_PROCESS)

 /*
 * Macros adapted from openssh's sandbox-seccomp-filter.c
@@ -304,201 +297,25 @@ static sock_fprog prog = {
    ARRLEN(filter), filter
 };

-// Our own wrapper for the seccomp() syscall.
+// our own wrapper for the seccomp() syscall
 int seccomp(unsigned int operation, unsigned int flags, void *args) {
    return syscall(__NR_seccomp, operation, flags, args);
 }

-#ifndef CONFIG_NOLANDLOCK
-
-// Support compilation on systems that only have older Landlock headers.
-#ifndef LANDLOCK_ACCESS_FS_REFER
-#define LANDLOCK_ACCESS_FS_REFER 0
-#endif
-#ifndef LANDLOCK_ACCESS_FS_TRUNCATE
-#define LANDLOCK_ACCESS_FS_TRUNCATE 0
-#endif
-
-struct landlock_ruleset_attr ruleset_attr = {
-    .handled_access_fs = LANDLOCK_ACCESS_FS_READ_FILE
-        | LANDLOCK_ACCESS_FS_WRITE_FILE
-        | LANDLOCK_ACCESS_FS_READ_DIR
-        | LANDLOCK_ACCESS_FS_MAKE_REG
-        | LANDLOCK_ACCESS_FS_MAKE_DIR
-        | LANDLOCK_ACCESS_FS_MAKE_SYM
-        | LANDLOCK_ACCESS_FS_MAKE_SOCK
-        | LANDLOCK_ACCESS_FS_MAKE_FIFO
-        | LANDLOCK_ACCESS_FS_MAKE_BLOCK
-        | LANDLOCK_ACCESS_FS_REMOVE_FILE
-        | LANDLOCK_ACCESS_FS_REMOVE_DIR
-        | LANDLOCK_ACCESS_FS_TRUNCATE
-        | LANDLOCK_ACCESS_FS_REFER
-};
-
-uint64_t landlock_perms = LANDLOCK_ACCESS_FS_READ_FILE
-    | LANDLOCK_ACCESS_FS_WRITE_FILE
-    | LANDLOCK_ACCESS_FS_TRUNCATE
-    | LANDLOCK_ACCESS_FS_MAKE_REG
-    | LANDLOCK_ACCESS_FS_REMOVE_FILE;
-
-int landlock_fd;
-bool landlock_supported;
-
-/*
- * Our own wrappers for Landlock syscalls.
- */
-
-int landlock_create_ruleset(const struct landlock_ruleset_attr *attr, size_t size, uint32_t flags) {
-    return syscall(__NR_landlock_create_ruleset, attr, size, flags);
-}
-
-int landlock_add_rule(int ruleset_fd, enum landlock_rule_type rule_type, const void *rule_attr, uint32_t flags) {
-    return syscall(__NR_landlock_add_rule, ruleset_fd, rule_type, rule_attr, flags);
-}
-
-int landlock_restrict_self(int ruleset_fd, uint32_t flags) {
-    return syscall(__NR_landlock_restrict_self, ruleset_fd, flags);
-}
-
-static void landlock_path(std::string path, uint32_t perms) {
-    struct landlock_path_beneath_attr path_beneath = {
-        .allowed_access = perms
-    };
-
-    path_beneath.parent_fd = open(path.c_str(), O_PATH|O_CLOEXEC);
-    if (path_beneath.parent_fd < 0) {
-        perror(path.c_str());
-        exit(1);
-    }
-
-    if (landlock_add_rule(landlock_fd, LANDLOCK_RULE_PATH_BENEATH, &path_beneath, 0)) {
-        perror("landlock_add_rule");
-        exit(1);
-    }
-
-    close(path_beneath.parent_fd);
-}
-
-static bool landlock_detect() {
-    int abi = landlock_create_ruleset(NULL, 0, LANDLOCK_CREATE_RULESET_VERSION);
-
-    if (abi < 0) {
-        if (errno == ENOSYS || errno == EOPNOTSUPP) {
-            std::cout << "[WARN] No Landlock support on this system" << std::endl;
-            return false;
-        }
-        perror("landlock_create_ruleset");
-        exit(1);
-    }
-
-    std::cout << "[INFO] Detected Landlock ABI version: " << abi << std::endl;
-
-    switch (abi) {
-    case 1:
-        ruleset_attr.handled_access_fs &= ~LANDLOCK_ACCESS_FS_REFER;
-        landlock_perms &= ~LANDLOCK_ACCESS_FS_REFER;
-        // fallthrough
-    case 2:
-        ruleset_attr.handled_access_fs &= ~LANDLOCK_ACCESS_FS_TRUNCATE;
-        landlock_perms &= ~LANDLOCK_ACCESS_FS_TRUNCATE;
-    }
-
-    return true;
-}
-
-static void landlock_init() {
-    std::cout << "[INFO] Setting up Landlock sandbox..." << std::endl;
-
-    landlock_supported = landlock_detect();
-
-    if (!landlock_supported)
-        return;
-
-    landlock_fd = landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
-    if (landlock_fd < 0) {
-        perror("landlock_create_ruleset");
-        exit(1);
-    }
-
-    std::string dbdir = std::filesystem::path(settings::DBPATH).parent_path();
-
-    // for the DB files (we can't rely on them being in the working directory)
-    landlock_path(dbdir == "" ? "." : dbdir, landlock_perms);
-    // for writing the gruntwork file
-    landlock_path(settings::TDATADIR, landlock_perms);
-    // for passowrd salting during account creation
-    landlock_path("/dev/urandom", LANDLOCK_ACCESS_FS_READ_FILE);
-    // for core dumps, optionally
-    if (settings::SANDBOXEXTRAPATH != "")
-        landlock_path(settings::SANDBOXEXTRAPATH, landlock_perms);
-}
-
-#endif // !CONFIG_NOLANDLOCK
-
-static void sigsys_handler(int signo, siginfo_t *info, void *context) {
-    // report the unhandled syscall
-    std::cout << "[FATAL] Unhandled syscall " << info->si_syscall
-       << " at " << std::hex << info->si_call_addr << " on arch " << info->si_arch << std::endl;
-
-    std::cout << "If you're unsure why this is happening, please read https://openfusion.dev/docs/development/the-sandbox/" << std::endl
-              << "for more information and possibly open an issue at https://github.com/OpenFusionProject/OpenFusion/issues to report"
-              << " needed changes in our seccomp filter." << std::endl;
-
-    exit(1);
-}
-
-void sandbox_init() {
+void sandbox_start() {
    if (!settings::SANDBOX) {
        std::cout << "[WARN] Running without a sandbox" << std::endl;
        return;
    }

-    // listen to SIGSYS to report unhandled syscalls
-    struct sigaction sa = {};
-
-    sa.sa_flags = SA_SIGINFO;
-    sa.sa_sigaction = sigsys_handler;
-
-    if (sigaction(SIGSYS, &sa, NULL) < 0) {
-        perror("sigaction");
-        exit(1);
-    }
-
-#ifndef CONFIG_NOLANDLOCK
-    landlock_init();
-#else
-    std::cout << "[WARN] Built without Landlock" << std::endl;
-#endif
-}
-
-void sandbox_start() {
-    if (!settings::SANDBOX)
-        return;
-
    std::cout << "[INFO] Starting seccomp-bpf sandbox..." << std::endl;

-    // Sandboxing starts in sandbox_thread_start().
-}
-
-void sandbox_thread_start() {
-    if (!settings::SANDBOX)
-        return;
-
    if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0) {
        perror("prctl");
        exit(1);
    }

-#ifndef CONFIG_NOLANDLOCK
-    if (landlock_supported) {
-        if (landlock_restrict_self(landlock_fd, 0)) {
-            perror("landlock_restrict_self");
-            exit(1);
-        }
-    }
-#endif
-
-    if (seccomp(SECCOMP_SET_MODE_FILTER, 0, &prog) < 0) {
+    if (seccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC, &prog) < 0) {
        perror("seccomp");
        exit(1);
    }
--- a/src/servers/CNLoginServer.cpp
+++ b/src/servers/CNLoginServer.cpp
@@ -1,5 +1,4 @@
 #include "servers/CNLoginServer.hpp"
-#include "servers/Monitor.hpp"

 #include "core/CNShared.hpp"
 #include "db/Database.hpp"
@@ -13,12 +12,6 @@

 std::map<CNSocket*, CNLoginData> CNLoginServer::loginSessions;

-namespace LoginServer {
-    std::vector<std::string> WheelFirstNames;
-    std::vector<std::string> WheelMiddleNames;
-    std::vector<std::string> WheelLastNames;
-}
-
 CNLoginServer::CNLoginServer(uint16_t p) {
    serverType = "login";
    port = p;
@@ -112,63 +105,77 @@ void loginFail(LoginError errorCode, std::string userLogin, CNSocket* sock) {

 void CNLoginServer::login(CNSocket* sock, CNPacketData* data) {
    auto login = (sP_CL2LS_REQ_LOGIN*)data->buf;
-
-    std::string userLogin;
-    std::string userToken; // could be password or auth cookie
+    // TODO: implement better way of sending credentials
+    std::string userLogin((char*)login->szCookie_TEGid);
+    std::string userPassword((char*)login->szCookie_authid);

    /*
-     * In this context, "cookie auth" just means the credentials were sent
-     * in the szCookie fields instead of szID and szPassword.
+     * Sometimes the client sends garbage cookie data.
+     * Validate it as normal credentials instead of using a length check before falling back.
     */
-    bool isCookieAuth = login->iLoginType == USE_COOKIE_FIELDS;
-
-    /*
-     * The std::string -> char* -> std::string maneuver should remove any
-     * trailing garbage after the null terminator.
-     */
-    if (isCookieAuth) {
-        userLogin = std::string(AUTOU8(login->szCookie_TEGid).c_str());
-        userToken = std::string(AUTOU8(login->szCookie_authid).c_str());
-    } else {
+    if (!CNLoginServer::isLoginDataGood(userLogin, userPassword)) {
+        /*
+         * The std::string -> char* -> std::string maneuver should remove any
+         * trailing garbage after the null terminator.
+         */
        userLogin = std::string(AUTOU16TOU8(login->szID).c_str());
-        userToken = std::string(AUTOU16TOU8(login->szPassword).c_str());
+        userPassword = std::string(AUTOU16TOU8(login->szPassword).c_str());
    }

-    if (!CNLoginServer::checkUsername(sock, userLogin)) {
+    // the client inserts a "\n" in the password if you press enter key in the middle of the password
+    // (not at the start or the end of the password field)
+    if (int(userPassword.find("\n")) > 0)
+        userPassword.erase(userPassword.find("\n"), 1);
+
+    // check regex
+    if (!CNLoginServer::isLoginDataGood(userLogin, userPassword)) {
+        // send a custom error message
+        INITSTRUCT(sP_FE2CL_GM_REP_PC_ANNOUNCE, msg);
+        std::string text = "Invalid login or password\n";
+        text += "Login has to be 4 - 32 characters long and can't contain special characters other than dash and underscore\n";
+        text += "Password has to be 8 - 32 characters long";          
+        U8toU16(text, msg.szAnnounceMsg, sizeof(msg.szAnnounceMsg));
+        msg.iDuringTime = 15;
+        sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
+
+        // we still have to send login fail to prevent softlock
        return loginFail(LoginError::LOGIN_ERROR, userLogin, sock);
    }
-
-    if (!isCookieAuth) {
-        // password was sent in plaintext
-        if (!CNLoginServer::checkPassword(sock, userToken)) {
-            return loginFail(LoginError::LOGIN_ERROR, userLogin, sock);
-        }
-    }
+        

    Database::Account findUser = {};
    Database::findAccount(&findUser, userLogin);
-
+    
    // account was not found
    if (findUser.AccountID == 0) {
-        /*
-         * Don't auto-create accounts if it's a cookie login.
-         * It'll either be a bad cookie or a plaintext password sent by auto-login;
-         * either way, we only want to allow auto-creation if the user explicitly entered their credentials.
-         */
-        if (settings::AUTOCREATEACCOUNTS && !isCookieAuth) {
-            return newAccount(sock, userLogin, userToken, login->iClientVerC);
-        }
+        if (settings::AUTOCREATEACCOUNTS)
+            return newAccount(sock, userLogin, userPassword, login->iClientVerC);

        return loginFail(LoginError::ID_DOESNT_EXIST, userLogin, sock);
    }

-    // make sure either a valid cookie or password was sent
-    if (!CNLoginServer::checkToken(sock, findUser, userToken, isCookieAuth)) {
+    if (!CNLoginServer::isPasswordCorrect(findUser.Password, userPassword))
        return loginFail(LoginError::ID_AND_PASSWORD_DO_NOT_MATCH, userLogin, sock);
-    }

-    if (CNLoginServer::checkBan(sock, findUser)) {
-        return; // don't send fail packet
+    // is the account banned
+    if (findUser.BannedUntil > getTimestamp()) {
+        // send a custom error message
+        INITSTRUCT(sP_FE2CL_GM_REP_PC_ANNOUNCE, msg);
+
+        // ceiling devision
+        int64_t remainingDays = (findUser.BannedUntil-getTimestamp()) / 86400 + ((findUser.BannedUntil - getTimestamp()) % 86400 != 0);
+
+        std::string text = "Your account has been banned. \nReason: ";
+        text += findUser.BanReason;
+        text += "\nBan expires in " + std::to_string(remainingDays) + " day";
+        if (remainingDays > 1)
+            text += "s";
+
+        U8toU16(text, msg.szAnnounceMsg, sizeof(msg.szAnnounceMsg));
+        msg.iDuringTime = 99999999;
+        sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
+        // don't send fail packet
+        return;
    }

    /* 
@@ -292,29 +299,10 @@ void CNLoginServer::nameSave(CNSocket* sock, CNPacketData* data) {
    INITSTRUCT(sP_LS2CL_REP_SAVE_CHAR_NAME_SUCC, resp);

    int errorCode = 0;
-
-    std::string firstName = AUTOU16TOU8(save->szFirstName);
-    std::string lastName = AUTOU16TOU8(save->szLastName);
-    int nameCheck = 0;
-
-    // if FNCode isn't 0, it's a wheel name
-    if (save->iFNCode != 0) {
-        if (!CNLoginServer::isNameWheelNameGood(save->iFNCode, save->iMNCode, save->iLNCode, firstName, lastName)) {
-            errorCode = 4;
-        } else {
-            nameCheck = settings:: APPROVEWHEELNAMES ? 1 : 0;
-        }
-    } else {
-        // custom name
-        nameCheck = settings::APPROVECUSTOMNAMES ? 1 : 0;
-    }
-
-    if (errorCode == 0) {
-        if (!CNLoginServer::isCharacterNameGood(firstName, lastName)) {
-            errorCode = 4;
-        } else if (!Database::isNameFree(firstName, lastName)) {
-            errorCode = 1;
-        }
+    if (!CNLoginServer::isCharacterNameGood(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
+        errorCode = 4;
+    } else if (!Database::isNameFree(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
+        errorCode = 1;
    }

    if (errorCode != 0) {
@@ -332,19 +320,12 @@ void CNLoginServer::nameSave(CNSocket* sock, CNPacketData* data) {
    if (!Database::isSlotFree(loginSessions[sock].userID, save->iSlotNum))
        return invalidCharacter(sock);

-    resp.iPC_UID = Database::createCharacter(save->iSlotNum, loginSessions[sock].userID, firstName.c_str(), lastName.c_str(), nameCheck);
+    resp.iPC_UID = Database::createCharacter(save, loginSessions[sock].userID);
    // if query somehow failed
    if (resp.iPC_UID == 0) {
        std::cout << "[WARN] Login Server: Database failed to create new character!" << std::endl;
        return invalidCharacter(sock);
    }
-
-    // fire name check event if needed
-    if (nameCheck != 1) {
-        std::string namereq = std::to_string(resp.iPC_UID) + " " + firstName + " " + lastName;
-        Monitor::namereqs.push_back(namereq);
-    }
-
    resp.iSlotNum = save->iSlotNum;
    resp.iGender = save->iGender;
    
@@ -360,9 +341,7 @@ void CNLoginServer::nameSave(CNSocket* sock, CNPacketData* data) {
    DEBUGLOG(
        std::cout << "Login Server: new character created" << std::endl;
        std::cout << "\tSlot: " << (int)save->iSlotNum << std::endl;
-        std::cout << "\tName: " << firstName << " " << lastName;
-        if (nameCheck != 1) std::cout << " (pending approval)";
-        std::cout << std::endl;
+        std::cout << "\tName: " << AUTOU16TOU8(save->szFirstName) << " " << AUTOU16TOU8(save->szLastName) << std::endl;
    )
 }

@@ -529,30 +508,11 @@ void CNLoginServer::changeName(CNSocket* sock, CNPacketData* data) {
    auto save = (sP_CL2LS_REQ_CHANGE_CHAR_NAME*)data->buf;

    int errorCode = 0;
-
-    std::string firstName = AUTOU16TOU8(save->szFirstName);
-    std::string lastName = AUTOU16TOU8(save->szLastName);
-    int nameCheck = 0;
-
-    // if FNCode isn't 0, it's a wheel name
-    if (save->iFNCode != 0) {
-        if (!CNLoginServer::isNameWheelNameGood(save->iFNCode, save->iMNCode, save->iLNCode, firstName, lastName)) {
-            errorCode = 4;
-        } else {
-            nameCheck = settings::APPROVEWHEELNAMES ? 1 : 0;
-        }
-    } else {
-        // custom name
-        nameCheck = settings::APPROVECUSTOMNAMES ? 1 : 0;
+    if (!CNLoginServer::isCharacterNameGood(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
+        errorCode = 4;
    }
-
-    if (errorCode == 0) {
-        if (!CNLoginServer::isCharacterNameGood(firstName, lastName)) {
-            errorCode = 4;
-        }
-        else if (!Database::isNameFree(firstName, lastName)) {
-            errorCode = 1;
-        }
+    else if (!Database::isNameFree(AUTOU16TOU8(save->szFirstName), AUTOU16TOU8(save->szLastName))) {
+        errorCode = 1;
    }

    if (errorCode != 0) {
@@ -567,15 +527,9 @@ void CNLoginServer::changeName(CNSocket* sock, CNPacketData* data) {
        return;
    }

-    if (!Database::changeName(save->iPCUID, loginSessions[sock].userID, firstName.c_str(), lastName.c_str(), nameCheck))
+    if (!Database::changeName(save, loginSessions[sock].userID))
        return invalidCharacter(sock);

-    // fire name check event if needed
-    if (nameCheck != 1) {
-        std::string namereq = std::to_string(save->iPCUID) + " " + firstName + " " + lastName;
-        Monitor::namereqs.push_back(namereq);
-    }
-
    INITSTRUCT(sP_LS2CL_REP_CHANGE_CHAR_NAME_SUCC, resp);
    resp.iPC_UID = save->iPCUID;
    memcpy(resp.szFirstName, save->szFirstName, sizeof(resp.szFirstName));
@@ -587,10 +541,8 @@ void CNLoginServer::changeName(CNSocket* sock, CNPacketData* data) {
    sock->sendPacket(resp, P_LS2CL_REP_CHANGE_CHAR_NAME_SUCC);

    DEBUGLOG(
-        std::cout << "Login Server: Name change request for character [" << save->iPCUID << "]" << std::endl;
-        std::cout << "\tNew name: " << firstName << " " << lastName;
-        if (nameCheck != 1) std::cout << " (pending approval)";
-        std::cout << std::endl;
+        std::cout << "Login Server: Name check success for character [" << save->iPCUID << "]" << std::endl;
+        std::cout << "\tNew name: " << AUTOU16TOU8(save->szFirstName) << " " << AUTOU16TOU8(save->szLastName) << std::endl;     
    )
 }

@@ -669,164 +621,21 @@ bool CNLoginServer::exitDuplicate(int accountId) {
    return false;
 }

-bool CNLoginServer::isUsernameGood(std::string& login) {
-    const std::regex loginRegex("[a-zA-Z0-9_-]{4,32}");
-    return (std::regex_match(login, loginRegex));
-}
+bool CNLoginServer::isLoginDataGood(std::string login, std::string password) {
+    std::regex loginRegex("[a-zA-Z0-9_-]{4,32}");
+    std::regex passwordRegex("[a-zA-Z0-9!@#$%^&*()_+]{8,32}");

-bool CNLoginServer::isPasswordGood(std::string& password) {
-    const std::regex passwordRegex("[a-zA-Z0-9!@#$%^&*()_+]{8,32}");
-    return (std::regex_match(password, passwordRegex));
+    return (std::regex_match(login, loginRegex) && std::regex_match(password, passwordRegex));
 }

 bool CNLoginServer::isPasswordCorrect(std::string actualPassword, std::string tryPassword) {
    return BCrypt::validatePassword(tryPassword, actualPassword);
 }

-bool CNLoginServer::isNameWheelNameGood(int fnCode, int mnCode, int lnCode, std::string& firstName, std::string& lastName) {
-    if (fnCode >= LoginServer::WheelFirstNames.size()
-        || mnCode >= LoginServer::WheelMiddleNames.size()
-        || lnCode >= LoginServer::WheelLastNames.size()) {
-        std::cout << "[WARN] Login Server: Invalid name codes received: " << fnCode << " " << mnCode << " " << lnCode << std::endl;
-        return false;
-    }
-
-    // client sends 1 if not selected for these. they point to a single blank space. why.
-    // just change them to 0, which points to an empty string; keeps the code much cleaner
-    if (mnCode == 1) mnCode = 0;
-    if (lnCode == 1) lnCode = 0;
-
-    std::string firstNameFromWheel = LoginServer::WheelFirstNames[fnCode];
-
-    std::string middleNamePart = LoginServer::WheelMiddleNames[mnCode];
-    std::string lastNamePart = LoginServer::WheelLastNames[lnCode];
-    if (mnCode != 0 && middleNamePart[middleNamePart.size() - 1] != ' ') {
-        // If there's a middle name, we need to lowercase the last name
-        std::transform(lastNamePart.begin(), lastNamePart.end(), lastNamePart.begin(), ::tolower);
-    }
-    std::string lastNameFromWheel = middleNamePart + lastNamePart;
-
-    if (firstNameFromWheel.empty() || lastNameFromWheel.empty()) {
-        std::cout << "[WARN] Login Server: Invalid wheel name combo: " << fnCode << " " << mnCode << " " << lnCode << std::endl;
-        return false;
-    }
-
-    if (firstName != firstNameFromWheel || lastName != lastNameFromWheel) {
-        std::cout << "[WARN] Login Server: Name wheel mismatch. Expected " << firstNameFromWheel << " " << lastNameFromWheel << ", got " << firstName << " " << lastName << std::endl;
-        return false;
-    }
-
-    return true;
-}
-
 bool CNLoginServer::isCharacterNameGood(std::string Firstname, std::string Lastname) {
    //Allow alphanumeric and dot characters in names(disallows dot and space characters at the beginning of a name)
    std::regex firstnamecheck(R"(((?! )(?!\.)[a-zA-Z0-9]*\.{0,1}(?!\.+ +)[a-zA-Z0-9]* {0,1}(?! +))*$)");
    std::regex lastnamecheck(R"(((?! )(?!\.)[a-zA-Z0-9]*\.{0,1}(?!\.+ +)[a-zA-Z0-9]* {0,1}(?! +))*$)");
    return (std::regex_match(Firstname, firstnamecheck) && std::regex_match(Lastname, lastnamecheck));
 }
-
-bool CNLoginServer::isAuthMethodAllowed(AuthMethod authMethod) {
-    // the config file specifies "comma-separated" but tbh we don't care
-    switch (authMethod) {
-    case AuthMethod::PASSWORD:
-        return settings::AUTHMETHODS.find("password") != std::string::npos;
-    case AuthMethod::COOKIE:
-        return settings::AUTHMETHODS.find("cookie") != std::string::npos;
-    default:
-        break;
-    }
-    return false;
-}
-
-bool CNLoginServer::checkPassword(CNSocket* sock, std::string& password) {
-    // check password auth allowed
-    if (!CNLoginServer::isAuthMethodAllowed(AuthMethod::PASSWORD)) {
-        // send a custom error message
-        INITSTRUCT(sP_FE2CL_GM_REP_PC_ANNOUNCE, msg);
-        std::string text = "Password login disabled\n";
-        text += "This server has disabled logging in with plaintext passwords.\n";
-        text += "Please contact an admin for assistance.";
-        U8toU16(text, msg.szAnnounceMsg, sizeof(msg.szAnnounceMsg));
-        msg.iDuringTime = 12;
-        sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
-
-        return false;
-    }
-
-    // check regex
-    if (!CNLoginServer::isPasswordGood(password)) {
-        // send a custom error message
-        INITSTRUCT(sP_FE2CL_GM_REP_PC_ANNOUNCE, msg);
-        std::string text = "Invalid password\n";
-        text += "Password has to be 8 - 32 characters long";
-        U8toU16(text, msg.szAnnounceMsg, sizeof(msg.szAnnounceMsg));
-        msg.iDuringTime = 10;
-        sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
-
-        return false;
-    }
-
-    return true;
-}
-
-bool CNLoginServer::checkUsername(CNSocket* sock, std::string& username) {
-    // check username regex
-    if (!CNLoginServer::isUsernameGood(username)) {
-        // send a custom error message
-        INITSTRUCT(sP_FE2CL_GM_REP_PC_ANNOUNCE, msg);
-        std::string text = "Invalid login\n";
-        text += "Login has to be 4 - 32 characters long and can't contain special characters other than dash and underscore";
-        U8toU16(text, msg.szAnnounceMsg, sizeof(msg.szAnnounceMsg));
-        msg.iDuringTime = 10;
-        sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
-
-        return false;
-    }
-
-    return true;
-}
-
-bool CNLoginServer::checkToken(CNSocket* sock, Database::Account& account, std::string& token, bool isCookieAuth) {
-    // check for valid cookie first
-    if (isCookieAuth && CNLoginServer::isAuthMethodAllowed(AuthMethod::COOKIE)) {
-        const char *cookie = token.c_str();
-        if (Database::checkCookie(account.AccountID, cookie)) {
-            return true;
-        }
-    }
-
-    // cookie check disabled or failed; check to see if it's a plaintext password
-    if (CNLoginServer::isAuthMethodAllowed(AuthMethod::PASSWORD)
-        && CNLoginServer::isPasswordCorrect(account.Password, token)) {
-        return true;
-    }
-
-    return false;
-}
-
-bool CNLoginServer::checkBan(CNSocket* sock, Database::Account& account) {
-    // check if the account is banned
-    if (account.BannedUntil > getTimestamp()) {
-        // send a custom error message
-        INITSTRUCT(sP_FE2CL_GM_REP_PC_ANNOUNCE, msg);
-
-        // ceiling devision
-        int64_t remainingDays = (account.BannedUntil-getTimestamp()) / 86400 + ((account.BannedUntil - getTimestamp()) % 86400 != 0);
-
-        std::string text = "Your account has been banned. \nReason: ";
-        text += account.BanReason;
-        text += "\nBan expires in " + std::to_string(remainingDays) + " day";
-        if (remainingDays > 1)
-            text += "s";
-
-        U8toU16(text, msg.szAnnounceMsg, sizeof(msg.szAnnounceMsg));
-        msg.iDuringTime = 99999999;
-        sock->sendPacket(msg, P_FE2CL_GM_REP_PC_ANNOUNCE);
-
-        return true;
-    }
-
-    return false;
-}
 #pragma endregion
--- a/src/servers/CNLoginServer.hpp
+++ b/src/servers/CNLoginServer.hpp
@@ -1,18 +1,11 @@
 #pragma once

 #include "core/Core.hpp"
-#include "db/Database.hpp"

 #include "Player.hpp"

 #include <map>

-namespace LoginServer {
-    extern std::vector<std::string> WheelFirstNames;
-    extern std::vector<std::string> WheelMiddleNames;
-    extern std::vector<std::string> WheelLastNames;
-}
-
 struct CNLoginData {
    int userID;
    time_t lastHeartbeat;
@@ -30,13 +23,6 @@ enum class LoginError {
    UPDATED_EUALA_REQUIRED = 9
 };

-#define USE_COOKIE_FIELDS 2
-
-enum class AuthMethod {
-    PASSWORD = 1,
-    COOKIE = 2
-};
-
 // WARNING: THERE CAN ONLY BE ONE OF THESE SERVERS AT A TIME!!!!!! TODO: change loginSessions & packet handlers to be non-static
 class CNLoginServer : public CNServer {
 private:
@@ -53,18 +39,10 @@ private:
    static void changeName(CNSocket* sock, CNPacketData* data);
    static void duplicateExit(CNSocket* sock, CNPacketData* data);

-    static bool isUsernameGood(std::string& login);
-    static bool isPasswordGood(std::string& password);
+    static bool isLoginDataGood(std::string login, std::string password);
    static bool isPasswordCorrect(std::string actualPassword, std::string tryPassword);
    static bool isAccountInUse(int accountId);
-    static bool isNameWheelNameGood(int fnCode, int mnCode, int lnCode, std::string& firstName, std::string& lastName);
    static bool isCharacterNameGood(std::string Firstname, std::string Lastname);
-    static bool isAuthMethodAllowed(AuthMethod authMethod);
-    static bool checkUsername(CNSocket* sock, std::string& username);
-    static bool checkPassword(CNSocket* sock, std::string& password);
-    static bool checkToken(CNSocket* sock, Database::Account& account, std::string& token, bool isCookieAuth);
-    static bool checkBan(CNSocket* sock, Database::Account& account);
-
    static void newAccount(CNSocket* sock, std::string userLogin, std::string userPassword, int32_t clientVerC);
    // returns true if success
    static bool exitDuplicate(int accountId);
--- a/src/servers/Monitor.cpp
+++ b/src/servers/Monitor.cpp
@@ -14,13 +14,6 @@ static std::mutex sockLock; // guards socket list
 static std::list<SOCKET> sockets;
 static sockaddr_in address;

-std::vector<std::string> Monitor::chats;
-std::vector<std::string> Monitor::bcasts;
-std::vector<std::string> Monitor::emails;
-std::vector<std::string> Monitor::namereqs;
-
-using namespace Monitor;
-
 static bool transmit(std::list<SOCKET>::iterator& it, char *buff, int len) {
    int n = 0;
    int sock = *it;
@@ -106,23 +99,15 @@ outer:
        }

        // chat
-        for (auto& str : chats) {
+        for (auto& str : Chat::dump) {
            n = std::snprintf(buff, sizeof(buff), "chat %s\n", str.c_str());

            if (!transmit(it, buff, n))
                goto outer;
        }

-        // announcements
-        for (auto& str : bcasts) {
-            n = std::snprintf(buff, sizeof(buff), "bcast %s\n", str.c_str());
-
-            if (!transmit(it, buff, n))
-                goto outer;
-        }
-
        // emails
-        for (auto& str : emails) {
+        for (auto& str : Email::dump) {
            n = process_email(buff, str);

            if (!transmit(it, buff, n))
@@ -132,24 +117,14 @@ outer:
                goto outer;
        }

-        // name requests
-        for (auto& str : namereqs) {
-            n = std::snprintf(buff, sizeof(buff), "namereq %s\n", str.c_str());
-
-            if (!transmit(it, buff, n))
-                goto outer;
-        }
-
        if (!transmit(it, (char*)"end\n", 4))
            continue;

        it++;
    }

-    chats.clear();
-    bcasts.clear();
-    emails.clear();
-    namereqs.clear();
+    Chat::dump.clear();
+    Email::dump.clear();
 }

 bool Monitor::acceptConnection(SOCKET fd, uint16_t revents) {
@@ -205,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");
@@ -236,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);

--- a/src/servers/Monitor.hpp
+++ b/src/servers/Monitor.hpp
@@ -3,11 +3,6 @@
 #include "core/Core.hpp"

 namespace Monitor {
-    extern std::vector<std::string> chats;
-    extern std::vector<std::string> bcasts;
-    extern std::vector<std::string> emails;
-    extern std::vector<std::string> namereqs;
-
    SOCKET init();
    bool acceptConnection(SOCKET, uint16_t);
 };
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -9,13 +9,10 @@
 // defaults :)
 int settings::VERBOSITY = 1;
 bool settings::SANDBOX = true;
-std::string settings::SANDBOXEXTRAPATH = "";

 int settings::LOGINPORT = 23000;
-bool settings::APPROVEWHEELNAMES = true;
-bool settings::APPROVECUSTOMNAMES = true;
+bool settings::APPROVEALLNAMES = true;
 bool settings::AUTOCREATEACCOUNTS = true;
-std::string settings::AUTHMETHODS = "password";
 int settings::DBSAVEINTERVAL = 240;

 int settings::SHARDPORT = 23001;
@@ -65,15 +62,11 @@ 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
 int settings::EVENTMODE = 0;

-// race settings
-bool settings::IZRACESCORECAPPED = true;
-
 void settings::init() {
    INIReader reader("config.ini");

@@ -88,12 +81,9 @@ void settings::init() {

    VERBOSITY = reader.GetInteger("", "verbosity", VERBOSITY);
    SANDBOX = reader.GetBoolean("", "sandbox", SANDBOX);
-    SANDBOXEXTRAPATH = reader.Get("", "sandboxextrapath", SANDBOXEXTRAPATH);
    LOGINPORT = reader.GetInteger("login", "port", LOGINPORT);
-    APPROVEWHEELNAMES = reader.GetBoolean("login", "acceptallwheelnames", APPROVEWHEELNAMES);
-    APPROVECUSTOMNAMES = reader.GetBoolean("login", "acceptallcustomnames", APPROVECUSTOMNAMES);
+    APPROVEALLNAMES = reader.GetBoolean("login", "acceptallcustomnames", APPROVEALLNAMES);
    AUTOCREATEACCOUNTS = reader.GetBoolean("login", "autocreateaccounts", AUTOCREATEACCOUNTS);
-    AUTHMETHODS = reader.Get("login", "authmethods", AUTHMETHODS);
    DBSAVEINTERVAL = reader.GetInteger("login", "dbsaveinterval", DBSAVEINTERVAL);
    SHARDPORT = reader.GetInteger("shard", "port", SHARDPORT);
    SHARDSERVERIP = reader.Get("shard", "ip", SHARDSERVERIP);
@@ -121,9 +111,7 @@ void settings::init() {
    EVENTMODE = reader.GetInteger("shard", "eventmode", EVENTMODE);
    DISABLEFIRSTUSEFLAG = reader.GetBoolean("shard", "disablefirstuseflag", DISABLEFIRSTUSEFLAG);
    ANTICHEAT = reader.GetBoolean("shard", "anticheat", ANTICHEAT);
-    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);
 }
--- a/src/settings.hpp
+++ b/src/settings.hpp
@@ -1,18 +1,13 @@
 #pragma once

-#include <stdint.h>
 #include <string>
-#include <time.h>

 namespace settings {
    extern int VERBOSITY;
    extern bool SANDBOX;
-    extern std::string SANDBOXEXTRAPATH;
    extern int LOGINPORT;
-    extern bool APPROVEWHEELNAMES;
-    extern bool APPROVECUSTOMNAMES;
+    extern bool APPROVEALLNAMES;
    extern bool AUTOCREATEACCOUNTS;
-    extern std::string AUTHMETHODS;
    extern int DBSAVEINTERVAL;
    extern int SHARDPORT;
    extern std::string SHARDSERVERIP;
@@ -41,10 +36,8 @@ namespace settings {
    extern int EVENTMODE;
    extern bool MONITORENABLED;
    extern int MONITORPORT;
-    extern std::string MONITORLISTENIP;
    extern int MONITORINTERVAL;
    extern bool DISABLEFIRSTUSEFLAG;
-    extern bool IZRACESCORECAPPED;

    void init();
 }
--- a/2
+++ b/2
--- a/vendor/JSON.hpp
+++ b/vendor/JSON.hpp
--- a/vendor/bcrypt/bcrypt.c
+++ b/vendor/bcrypt/bcrypt.c
@@ -22,14 +22,9 @@
 #endif
 #include <errno.h>

-#if defined(_WIN32) && !defined(_WIN64)
-typedef __int32 ssize_t;
-#elif defined(_WIN32) && defined(_WIN64)
-typedef __int64 ssize_t;
-#endif
-
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32 || _WIN64
 // On windows we need to generate random bytes differently.
+typedef __int64 ssize_t;
 #define BCRYPT_HASHSIZE 60

 #include "bcrypt.h"
@@ -38,9 +33,8 @@ typedef __int64 ssize_t;
 #include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
 #else
 #include "bcrypt.h"
-#endif
-
 #include "ow-crypt.h"
+#endif

 #define RANDBYTES (16)

@@ -123,7 +117,7 @@ int bcrypt_gensalt(int factor, char salt[BCRYPT_HASHSIZE])
 	char *aux;

 	// Note: Windows does not have /dev/urandom sadly.
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32 || _WIN64
 	HCRYPTPROV p;
 	ULONG     i;

--- a/vendor/bcrypt/crypt_blowfish.c
+++ b/vendor/bcrypt/crypt_blowfish.c
@@ -51,7 +51,7 @@
 #endif

 /* Just to make sure the prototypes match the actual definitions */
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32 || _WIN64
 #include "crypt_blowfish.h"
 #else
 #include "crypt_blowfish.h"
--- a/vendor/bcrypt/wrapper.c
+++ b/vendor/bcrypt/wrapper.c
@@ -41,7 +41,7 @@
 #define __SKIP_GNU
 #endif

-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32 | _WIN64
 #include "ow-crypt.h"

 #include "crypt_blowfish.h"
@@ -251,7 +251,7 @@ char *__crypt_gensalt_ra(const char *prefix, unsigned long count,
 		input, size, output, sizeof(output));

 	if (retval) {
-#if defined(_WIN32) || defined(_WIN64)
+#ifdef _WIN32 | _WIN64
 		retval = _strdup(retval);
 #else
 		retval = strdup(retval);
--- a/win-setup.ps1
+++ b/win-setup.ps1
@@ -1,52 +0,0 @@
-# Run this first if needed:
-# Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process
-param (
-    # height of largest column without top bar
-    [Parameter(Mandatory=$true)]
-    [string]$protocolVersion
-)
-
-$ErrorActionPreference = 'Stop'
-# check for vscmd
-if ([string]::IsNullOrEmpty($env:VSCMD_VER)) {
-    Write-Host 'Must be run inside of VS Developer Powershell'
-    exit 1
-}
-
-# check for git
-try {
-    $git_version = git --version
-} catch {
-    Write-Host 'git not installed'
-    exit 1
-}
-
-# setup vcpkg
-if (Test-Path -Path 'vcpkg\') {
-    Write-Host 'vcpkg already setup'
-} else {
-    Write-Host 'Setting up vcpkg...'
-    git clone "https://github.com/microsoft/vcpkg.git"
-}
-
-if (-not (Test-Path -Path 'vcpkg\vcpkg.exe')) {
-    Write-Host 'Bootstrapping vcpkg...'
-    Start-Process -Wait -NoNewWindow -FilePath 'vcpkg\bootstrap-vcpkg.bat' -ArgumentList '-disableMetrics'
-}
-
-$env:VCPKG_ROOT='' # ignore msvc's vcpkg root, it doesn't work
-$vcpkg = (Resolve-Path -Path '.\vcpkg')
-Write-Host "vcpkg installed to $vcpkg"
-Start-Process -Wait -NoNewWindow -FilePath 'vcpkg\vcpkg.exe' -ArgumentList 'install sqlite3:x64-windows'
-
-# setup cmake project
-if (Test-Path -Path 'build\') {
-    Write-Host 'cmake project already setup';
-} else {
-    Write-Host 'Setting up cmake project...'
-    Start-Process -Wait -NoNewWindow -FilePath 'cmake' -ArgumentList "-B build -DPROTOCOL_VERSION=$protocolVersion -DCMAKE_TOOLCHAIN_FILE=$vcpkg\scripts\buildsystems\vcpkg.cmake"
-}
-
-Write-Host 'Done!'
-$sln = (Resolve-Path -Path '.\build\OpenFusion.sln')
-Write-Host "Solution file is at $sln"
Author	SHA1	Message	Date
Gent Semaj	e7e4667620	Merge `d8b63a043e` into `c636c538eb`	2023-09-02 20:50:38 -07:00
gsemaj	d8b63a043e	Fix conflicts	2023-08-23 19:22:38 -07:00
gsemaj	f2447cd940	Clear player buffs on death if not revived	2023-08-20 18:16:14 -07:00
gsemaj	97dca62fd0	Fix egg skill handling	2023-08-20 18:07:23 -07:00
gsemaj	0eff236512	Fix corruption reflection	2023-08-19 16:19:36 -07:00
gsemaj	0fcf41cbfe	Fix guard FOR REAL	2023-08-19 15:03:16 -07:00
gsemaj	efb3887e3e	Fix corruption attack rebound	2023-08-19 14:54:18 -07:00
gsemaj	874bdefb13	Fix passive powers	2023-08-19 14:46:35 -07:00
gsemaj	94b08659d2	Fix battery drain block	2023-08-19 14:21:04 -07:00
gsemaj	d936d0b621	Updater contributer guide	2023-08-19 20:46:41 +00:00
gsemaj	249e5b081f	Move corruption block to new system	2023-08-19 20:46:41 +00:00
gsemaj	52c1ed4480	Return home heal to new system	2023-08-19 20:46:41 +00:00
gsemaj	522b9ab7b8	Passive mob buffs to new system	2023-08-19 20:46:41 +00:00
gsemaj	c0a9ec6b7c	Move mob active skills to new system	2023-08-19 20:46:41 +00:00
gsemaj	d416763ae0	Move eruption attacks to new system	2023-08-19 20:46:41 +00:00
gsemaj	ff74c8ede1	Implement leech	2023-08-19 20:46:41 +00:00
gsemaj	e64bcf91a5	Make `clearBuffs` memory-safe improperly erasing during iteration oops	2023-08-19 20:46:41 +00:00
gsemaj	b04c292272	Break if player dies from buff combat tick	2023-08-19 20:46:41 +00:00
gsemaj	36b6aeeb00	Fix segv: Halt buff iteration if mob is dead	2023-08-19 20:46:41 +00:00
gsemaj	93ec6380c1	Tighten parameter for removeBuff	2023-08-19 20:46:41 +00:00
gsemaj	c1aff8d3c3	Move drain to new system TODO - There is a seg fault that happens when drain kills the mob - leech unimplemented - mob skills unimplemented	2023-08-19 20:46:41 +00:00
gsemaj	1cf2be9968	reorder some stuff	2023-08-19 20:46:41 +00:00
gsemaj	dd4063e416	Fix icon not disappearing for debuffs	2023-08-19 20:46:41 +00:00
gsemaj	464d18820b	Tick buffs for mobs	2023-08-19 20:46:41 +00:00
gsemaj	288a4a3da5	Fix infinite slowdown with snare	2023-08-19 20:46:41 +00:00
gsemaj	807e182407	Implement buff handling for CombatNPC	2023-08-19 20:46:41 +00:00
gsemaj	0dd628717d	Move buffs from Mob to CombatNPC	2023-08-19 20:46:41 +00:00
gsemaj	c70205a15b	Implement buffs for mobs	2023-08-19 20:46:41 +00:00
gsemaj	8062e52c55	Damage n debuff handler	2023-08-19 20:46:41 +00:00
gsemaj	3b5f6c0fe7	Fix trailing structs The change to allow flexible trailing struct sizes broke `attachSkillResults` oops	2023-08-19 20:46:41 +00:00
gsemaj	e9cd5db8a2	Get rid of cbf	2023-08-19 20:46:41 +00:00
gsemaj	e7450b974c	Add `clearBuffs`	2023-08-19 20:46:41 +00:00
gsemaj	13e71de785	Make skill result size check an assertion	2023-08-19 20:46:41 +00:00
gsemaj	e3c3da87b2	Oops	2023-08-19 20:46:41 +00:00
gsemaj	4bc53b2e7e	Change SkillResult size validation Since leech uses trailing structs of two different sizes, just use the max SkillResult size in validation/zeroing and then check for overflow in a couple extra places	2023-08-19 20:46:41 +00:00
gsemaj	03abb6f830	Reorder abilities to match client handling	2023-08-19 20:46:41 +00:00
gsemaj	bd1abcef72	Don't add buff if player dead	2023-08-19 20:46:41 +00:00
gsemaj	49fa6d65c4	Fix seg fault with egg powers	2023-08-19 20:46:41 +00:00
gsemaj	773e4b36e1	Reuse `useNanoSkill` codepath for passive powers	2023-08-19 20:46:41 +00:00
gsemaj	945599f93c	Fix recall	2023-08-19 20:46:41 +00:00
gsemaj	78c15e2899	Make SkillType an enum class	2023-08-19 20:46:41 +00:00
gsemaj	eaebe3ba4c	Fix self recall	2023-08-19 20:46:41 +00:00
gsemaj	9312706524	[WIP] Fix targeting for groups	2023-08-19 20:46:41 +00:00
gsemaj	80dd6b5479	[WIP] Active power handling TODO: - recall (self and group) is broken - revive (only group) is broken - damage + debuff is unimplemented	2023-08-19 20:46:41 +00:00
gsemaj	751fd4fd9d	Sync with master	2023-08-19 20:46:41 +00:00
gsemaj	ec71fd8f46	Add overload to remove specific class of buff I initially added this because, despite the higher tickrate for composite condition calculations thanks to the last commit, there is still a slight status icon delay when rapidly switching nanos. I attempted to use this to make that problem go away and for whatever reason it wasn't effective, but I figure it would be useful to have anyway so I'm keeping it.	2023-08-19 20:46:41 +00:00
gsemaj	f0bb90b547	Move some stuff from playerTick to player combat step	2023-08-19 20:46:41 +00:00
gsemaj	0dfcc928a9	Refactor group handling	2023-08-19 20:46:41 +00:00
gsemaj	dc6386131a	Port egg buffs over to new system	2023-08-19 20:46:41 +00:00
gsemaj	9977907842	More skill handlers Note: need to revisit these when active powers are implemented to make sure they are correct. DamageNDebuff isn't even implemented yet.	2023-08-19 20:46:41 +00:00
gsemaj	723e455b1d	Passive nano powers	2023-08-19 20:46:41 +00:00
gsemaj	ab4b763f00	YET ANOTHER ITERATION of the new ability system I am very tired	2023-08-19 20:46:41 +00:00
gsemaj	8b94bcd5ca	Passive nano powers pt 1	2023-08-19 20:46:41 +00:00
gsemaj	1637b8e789	Passive nano powers boilerplate	2023-08-19 20:46:41 +00:00
gsemaj	da38bbec29	Fix timed out buffs not calling onExpire	2023-08-19 20:46:41 +00:00
gsemaj	a07f36e379	Buff framework tweaks + polish	2023-08-19 20:46:41 +00:00
gsemaj	afc48b7676	Rework buff callbacks The first implementation was way too complicated and prone to bugs. This is much more simple flexible; first off, std::function is now used instead of a raw function pointer, so lambdas and binds are fair game which is great for scripting. Second, callbacks for all stacks are executed. It is up to the callback target to ensure correct behavior.	2023-08-19 20:46:41 +00:00
gsemaj	15b6cd2fb4	oops	2023-08-19 20:46:41 +00:00
gsemaj	34669eb7b9	CRLF purge in Buffs.cpp	2023-08-19 20:46:41 +00:00
gsemaj	ded7462677	egg prep	2023-08-19 20:46:41 +00:00
gsemaj	704d6a2452	Move `Buff` implementation to Buffs.cpp	2023-08-19 20:46:41 +00:00
gsemaj	98634d5aa2	New buff framework (player implementation) Get rid of `iConditionBitFlag` in favor of a system of individual buff objects that get composited to a bitflag on-the-fly. Buff objects can have callbacks for application, expiration, and tick, making them pretty flexible. Scripting languages can eventually use these for custom behavior, too. TODO: - Get rid of bitflag in BaseNPC - Apply buffs from passive nano powers - Apply buffs from active nano powers - Move eggs to new system - ???	2023-08-19 20:46:41 +00:00
gsemaj	306a75f469	The great re-`#include` Was getting frustrated by the inconsistency in our include statements, which were causing me problems. As a result, I went through and manually re-organized every include statement in non-core files. I'm just gonna copy my rant from Discord: FOR HEADER FILES (.hpp): - everything you use IN THE HEADER must be EXPLICITLY INCLUDED with the exception of things that fall under Core.hpp - you may NOT include ANYTHING ELSE FOR SOURCE FILES (.cpp): - you can #include whatever you want as long as the partner header is included first - anything that gets included by another include is fair game - redundant includes are ok because they'll be harmless AS LONG AS our header files stay lean. the point of this is NOT to optimize the number of includes used all around or make things more efficient necessarily. it's to improve readability & coherence and make it easier to avoid cyclical issues	2023-08-19 20:46:41 +00:00
gsemaj	e4e4a421f4	Get rid of player fire rate suspicion This was super primitive & jank, and caused false positives. Will replace with a polished system later on.	2023-08-19 20:46:41 +00:00
gsemaj	2f612ce0e1	Handle case where cmake is invoked outside root	2023-08-19 20:46:41 +00:00
gsemaj	760170af94	Start moving passive power processing to `playerTick`	2023-08-19 20:46:41 +00:00
gsemaj	2f4c8cdd60	Groundwork for new buff system	2023-08-19 20:46:41 +00:00
gsemaj	c8f5aab929	Active power classification	2023-08-19 20:46:41 +00:00
gsemaj	9f74b7decb	some struct reorg	2023-08-19 20:46:41 +00:00
gsemaj	eea4107665	Replace group filter operator with function	2023-08-19 20:46:41 +00:00
gsemaj	ad53ec82af	Ignore .bak files for my local backups lol	2023-08-19 20:46:41 +00:00
gsemaj	22c93ac854	Refactor player groups Group structures are used now. Adds more checks in some places but simplifies things overall. We can expand this system to entities as well now pretty trivially.	2023-08-19 20:46:41 +00:00
gsemaj	710300c04c	(WIP) EXPERIMENTAL GROUP CHANGES	2023-08-19 20:46:41 +00:00
gsemaj	04221f1c5f	(WIP) TODO ABILITIES	2023-08-19 20:46:41 +00:00
gsemaj	828f49cd62	Move mob aggro logic into `takeDamage` override God that feels good	2023-08-19 20:46:41 +00:00
gsemaj	4f49bcea87	(WIP) Move away from rigid states/transitions to allow custom behavior	2023-08-19 20:46:41 +00:00
gsemaj	f6094fde58	EntityType -> EntityKind	2023-08-19 20:46:41 +00:00
gsemaj	595dcda1b7	(WIP) onRoamStart hook implementation	2023-08-19 20:46:41 +00:00
gsemaj	b6f15824f1	(WIP) Remove `BaseNPC::barkerType` to save space	2023-08-19 20:46:41 +00:00
gsemaj	35e938b8c6	ope	2023-08-19 20:46:41 +00:00
gsemaj	345c9cd3b2	(WIP) onCombatStart hook implementation	2023-08-19 20:46:41 +00:00
gsemaj	68d53feea3	(WIP) onDeath hook implementation	2023-08-19 20:46:41 +00:00
gsemaj	45742e90a2	(WIP) Add src param to transition + certain hooks Should all hooks have src? I think not	2023-08-19 20:46:41 +00:00
gsemaj	69a478b777	(WIP) Transitions + hook definitions + onRetreat hook implementation	2023-08-19 20:46:41 +00:00
gsemaj	c32e5b2d5e	(WIP) Point 2: Generalization	2023-08-19 20:46:41 +00:00
gsemaj	3d572432b3	(WIP) Point 1: step functions	2023-08-19 20:46:41 +00:00
gsemaj	0c4cdaeabf	(WIP) Start implementing ICombatant Start by replacing `hitMob` with `takeDamage` interface function. Simplify `pcAttackChars` a little by utilizing the new interface, then add more interface functions as needed. A lot of the combat logic is tied to the `Mob` class. Need to start moving stuff over to CombatNPC.	2023-08-19 20:46:41 +00:00
gsemaj	ed866fbee4	(WIP) Move ICombatant functions around a bit	2023-08-19 20:46:41 +00:00
gsemaj	5ab0112298	(WIP) Initial ICombatant draft	2023-08-19 20:46:41 +00:00
dongresource	4494ba5932	[refactor] Get rid of NPC.hpp This file was already obsoleted at the start of the refactor, but seems to have escaped notice until now.	2023-08-19 20:46:41 +00:00
dongresource	803073213e	[refactor] Replace a few uses of magic numbers with enums	2023-08-19 20:46:41 +00:00
dongresource	4153d5cd30	[refactor] Cosmetic cleanup in Fuse fight functions	2023-08-19 20:46:41 +00:00
dongresource	71f1f6edb9	[refactor] Remove redundant coord args from most entity constructors Mobs and CombatNPCs still need theirs in order to properly set their roaming and spawn coords. Assignment of the latter has been moved to the CombatNPC constructor, where it should have already been.	2023-08-19 20:46:41 +00:00
gsemaj	32fad56d38	[WIP] Stub power handler	2023-08-19 20:46:41 +00:00
gsemaj	af7b99195f	[WIP] Use EntityRef instead of CNSocket in ability handler	2023-08-19 20:46:41 +00:00
gsemaj	efc00e63b3	[WIP] Replace appearance data with individual fields Storing certain things in appearance data and others in their own fields was gross. Now everything is stored on the same level and functions have been added to generate appearance data when it's needed by the client.	2023-08-19 20:46:41 +00:00
gsemaj	7ab01b098d	[WIP] Rename Entity.type -> Entity.kind	2023-08-19 20:46:41 +00:00
gsemaj	32db574700	[WIP] Fix Nanos -> Abilities namespace calls	2023-08-19 20:46:41 +00:00
gsemaj	c965024d1c	[WIP] Initial merge of ability namespaces & features	2023-08-19 20:46:41 +00:00