quake2ts 0.0.214 → 0.0.216

package/packages/server/dist/index.cjs

@@ -201,7 +201,8 @@ function createClient(index, net) {
     lastMessage: 0,
     lastConnect: Date.now(),
     challenge: 0,
-    messageQueue: []
+    messageQueue: [],
+    lastPacketEntities: []
   };
 }
 function createEmptyUserCommand() {
@@ -345,6 +346,24 @@ var NULL_STATE = {
   sound: 0,
   event: 0
 };
+function writeRemoveEntity(number, writer) {
+  let bits = U_REMOVE;
+  if (number >= 256) {
+    bits |= U_NUMBER16;
+  }
+  if (bits & 65280) {
+    bits |= U_MOREBITS1;
+  }
+  writer.writeByte(bits & 255);
+  if (bits & U_MOREBITS1) {
+    writer.writeByte(bits >> 8 & 255);
+  }
+  if (bits & U_NUMBER16) {
+    writer.writeShort(number);
+  } else {
+    writer.writeByte(number);
+  }
+}
 function writeDeltaEntity(from, to, writer, force, newEntity) {
   let bits = 0;
   if (newEntity) {
@@ -796,10 +815,33 @@ var DedicatedServer = class {
     });
     this.game.init(0);
     this.game.spawnWorld();
+    this.populateBaselines();
     this.sv.state = 2 /* Game */;
     this.frameInterval = setInterval(() => this.runFrame(), FRAME_TIME_MS);
     console.log("Server started.");
   }
+  populateBaselines() {
+    if (!this.game) return;
+    this.game.entities.forEachEntity((ent) => {
+      if (ent.index >= import_shared4.MAX_EDICTS) return;
+      if (ent.modelindex > 0 || ent.solid !== import_game.Solid.Not) {
+        this.sv.baselines[ent.index] = {
+          number: ent.index,
+          origin: { ...ent.origin },
+          angles: { ...ent.angles },
+          modelIndex: ent.modelindex,
+          frame: ent.frame,
+          skinNum: ent.skin,
+          effects: ent.effects,
+          renderfx: ent.renderfx,
+          solid: ent.solid,
+          sound: ent.sounds,
+          // Assuming ent.sounds maps to 'sound' field in EntityState
+          event: 0
+        };
+      }
+    });
+  }
   stop() {
     if (this.frameInterval) clearInterval(this.frameInterval);
     if (this.wss) this.wss.close();
@@ -1019,12 +1061,20 @@ var DedicatedServer = class {
     writePlayerState(writer, ps);
     writer.writeByte(import_shared4.ServerCommand.packetentities);
     const entities = snapshot.packetEntities || [];
+    const currentEntityIds = [];
     for (const entity of entities) {
+      currentEntityIds.push(entity.number);
       writeDeltaEntity({}, entity, writer, false, true);
     }
+    for (const oldId of client.lastPacketEntities) {
+      if (!currentEntityIds.includes(oldId)) {
+        writeRemoveEntity(oldId, writer);
+      }
+    }
     writer.writeShort(0);
     client.net.send(writer.getData());
     client.lastFrame = this.sv.frame;
+    client.lastPacketEntities = currentEntityIds;
   }
   // GameEngine Implementation
   trace(start, end) {

package/packages/server/dist/index.d.cts

@@ -27,6 +27,7 @@ declare class DedicatedServer implements GameEngine {
     private entityIndex;
     constructor(port?: number);
     start(mapName: string): Promise<void>;
+    private populateBaselines;
     stop(): void;
     private handleConnection;
     private onClientMessage;
@@ -90,6 +91,7 @@ interface Client {
     lastConnect: number;
     challenge: number;
     messageQueue: Uint8Array[];
+    lastPacketEntities: number[];
 }
 declare function createClient(index: number, net: NetDriver): Client;
 

package/packages/server/dist/index.d.ts

@@ -27,6 +27,7 @@ declare class DedicatedServer implements GameEngine {
     private entityIndex;
     constructor(port?: number);
     start(mapName: string): Promise<void>;
+    private populateBaselines;
     stop(): void;
     private handleConnection;
     private onClientMessage;
@@ -90,6 +91,7 @@ interface Client {
     lastConnect: number;
     challenge: number;
     messageQueue: Uint8Array[];
+    lastPacketEntities: number[];
 }
 declare function createClient(index: number, net: NetDriver): Client;
 

package/packages/server/dist/index.js

@@ -112,7 +112,7 @@ var WebSocketNetDriver = class {
 
 // src/dedicated.ts
 import { WebSocketServer } from "ws";
-import { createGame, MulticastType } from "@quake2ts/game";
+import { createGame, MulticastType, Solid } from "@quake2ts/game";
 
 // src/client.ts
 import { UPDATE_BACKUP } from "@quake2ts/shared";
@@ -161,7 +161,8 @@ function createClient(index, net) {
     lastMessage: 0,
     lastConnect: Date.now(),
     challenge: 0,
-    messageQueue: []
+    messageQueue: [],
+    lastPacketEntities: []
   };
 }
 function createEmptyUserCommand() {
@@ -305,6 +306,24 @@ var NULL_STATE = {
   sound: 0,
   event: 0
 };
+function writeRemoveEntity(number, writer) {
+  let bits = U_REMOVE;
+  if (number >= 256) {
+    bits |= U_NUMBER16;
+  }
+  if (bits & 65280) {
+    bits |= U_MOREBITS1;
+  }
+  writer.writeByte(bits & 255);
+  if (bits & U_MOREBITS1) {
+    writer.writeByte(bits >> 8 & 255);
+  }
+  if (bits & U_NUMBER16) {
+    writer.writeShort(number);
+  } else {
+    writer.writeByte(number);
+  }
+}
 function writeDeltaEntity(from, to, writer, force, newEntity) {
   let bits = 0;
   if (newEntity) {
@@ -756,10 +775,33 @@ var DedicatedServer = class {
     });
     this.game.init(0);
     this.game.spawnWorld();
+    this.populateBaselines();
     this.sv.state = 2 /* Game */;
     this.frameInterval = setInterval(() => this.runFrame(), FRAME_TIME_MS);
     console.log("Server started.");
   }
+  populateBaselines() {
+    if (!this.game) return;
+    this.game.entities.forEachEntity((ent) => {
+      if (ent.index >= MAX_EDICTS) return;
+      if (ent.modelindex > 0 || ent.solid !== Solid.Not) {
+        this.sv.baselines[ent.index] = {
+          number: ent.index,
+          origin: { ...ent.origin },
+          angles: { ...ent.angles },
+          modelIndex: ent.modelindex,
+          frame: ent.frame,
+          skinNum: ent.skin,
+          effects: ent.effects,
+          renderfx: ent.renderfx,
+          solid: ent.solid,
+          sound: ent.sounds,
+          // Assuming ent.sounds maps to 'sound' field in EntityState
+          event: 0
+        };
+      }
+    });
+  }
   stop() {
     if (this.frameInterval) clearInterval(this.frameInterval);
     if (this.wss) this.wss.close();
@@ -979,12 +1021,20 @@ var DedicatedServer = class {
     writePlayerState(writer, ps);
     writer.writeByte(ServerCommand2.packetentities);
     const entities = snapshot.packetEntities || [];
+    const currentEntityIds = [];
     for (const entity of entities) {
+      currentEntityIds.push(entity.number);
       writeDeltaEntity({}, entity, writer, false, true);
     }
+    for (const oldId of client.lastPacketEntities) {
+      if (!currentEntityIds.includes(oldId)) {
+        writeRemoveEntity(oldId, writer);
+      }
+    }
     writer.writeShort(0);
     client.net.send(writer.getData());
     client.lastFrame = this.sv.frame;
+    client.lastPacketEntities = currentEntityIds;
   }
   // GameEngine Implementation
   trace(start, end) {