h1z1-server 0.47.2-1 → 0.47.2-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1z1-server",
-  "version": "0.47.2-1",
+  "version": "0.47.2-2",
   "description": "Library for emulating h1z1 servers",
   "author": "Quentin Gruber <quentingruber@gmail.com> (http://github.com/quentingruber)",
   "license": "GPL-3.0-only",

package/src/packets/ClientProtocol/ClientProtocol_1080/base.ts

@@ -1940,13 +1940,17 @@ export const basePackets: PacketStructures = [
               type: "uint64string",
               defaultValue: "0x0"
             },
-            { name: "unknownQword3", type: "uint64string", defaultValue: "" },
+            {
+              name: "unknownQword3",
+              type: "uint64string",
+              defaultValue: "0x0"
+            },
             {
               name: "vehicleLoadoutRelatedDword",
               type: "uint32",
               defaultValue: 0
             },
-            { name: "unknownDword40", type: "int32", defaultValue: 0 },
+            { name: "unknownDword40", type: "int32", defaultValue: -1 },
             { name: "isAdmin", type: "boolean", defaultValue: true },
             { name: "firstPersonOnly", type: "boolean", defaultValue: false },
             { name: "spectatorFlags", type: "uint8", defaultValue: 0 }

package/src/servers/ZoneServer2016/data/emotes.ts

@@ -0,0 +1,111 @@
+// Emote name to ID mapping
+const emoteMap: { [Name: string]: number } = {
+  wavehello: 2,
+  wavebye: 3,
+  doublebird: 4,
+  point: 5,
+  agree: 6,
+  applause: 7,
+  beckon: 8,
+  cutthroat: 9,
+  salute: 10,
+  dancea: 11,
+  wavehellob: 12,
+  laugh: 13,
+  no: 14,
+  noway: 15,
+  handsup: 16,
+  sit: 17,
+  teabag: 18,
+  birdcannon: 20,
+  bootyslap: 21,
+  crotchchop: 22,
+  crybaby: 23,
+  grind: 24,
+  pelvicthrust: 25,
+  sarcasmdance: 26,
+  screwyou2: 27,
+  shimmydance: 28,
+  werenotworthy: 29,
+  beg: 30,
+  fisticuffs: 31,
+  flex: 32,
+  hump: 33,
+  flexpoint: 34,
+  listentothecrowd: 35,
+  airguitar: 36,
+  basicsalute: 37,
+  blowkiss: 38,
+  bow: 39,
+  buttscratchsniff: 40,
+  cheer: 41,
+  cold: 42,
+  confused: 43,
+  crazy: 44,
+  cry: 45,
+  curse: 46,
+  curtsey: 47,
+  doh: 48,
+  fingerwaggle: 49,
+  fistpump: 50,
+  frustrated: 51,
+  flustered: 52,
+  getattention: 53,
+  glare: 54,
+  handbeckon: 55,
+  happydance: 56,
+  hot: 57,
+  isitraining: 58,
+  jumphooray: 59,
+  loser: 60,
+  lookaway: 61,
+  listen: 62,
+  moon: 63,
+  neener: 64,
+  orate: 65,
+  pout: 66,
+  ponder: 67,
+  peer: 68,
+  royalwave: 69,
+  rudeslap: 70,
+  sad: 71,
+  scold: 72,
+  screwyoua: 73,
+  scream: 74,
+  shakefist: 75,
+  shakehead: 76,
+  shame: 77,
+  shieldeyes: 78,
+  shiverdownspine: 79,
+  shrugdance: 80,
+  sigh: 81,
+  singlefingerwaggle: 82,
+  sniff: 83,
+  stretch: 84,
+  square: 85,
+  sulk: 86,
+  swearoath: 87,
+  teabagb: 88,
+  tapfoot: 89,
+  teabaglight: 90,
+  threaten: 91,
+  thanks: 92,
+  thumbsdown: 93,
+  thumbsup: 94,
+  victory: 95,
+  violin: 96,
+  whistle: 97,
+  wave: 98,
+  wince: 99,
+  woohoo: 100,
+  raisecrown: 101,
+  thriller: 102
+};
+
+// Default emotes that don't require ownership
+const defaultEmotes = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+
+// Array of emote names for listing
+const emoteNames: string[] = Object.keys(emoteMap);
+
+export { emoteMap, emoteNames, defaultEmotes };

package/src/servers/ZoneServer2016/handlers/commands/commands.ts

@@ -39,6 +39,7 @@ import {
   characterKitLoadout,
   characterVehicleKit
 } from "../../data/loadouts";
+import { emoteMap, emoteNames, defaultEmotes } from "../../data/emotes";
 import {
   Effects,
   EquipSlots,
@@ -481,40 +482,29 @@ export const commands: Array<Command> = [
   {
     name: "emote",
     permissionLevel: PermissionLevels.DEFAULT,
-    execute: (server: ZoneServer2016, client: Client, args: Array<string>) => {
-      if (server.isPvE) {
-        const animationId = Number(args[0]);
-        if (!animationId || animationId > MAX_UINT32) {
-          server.sendChatText(client, "Usage /emote <id>");
-          return;
-        }
+    execute: async (
+      server: ZoneServer2016,
+      client: Client,
+      args: Array<string>
+    ) => {
+      if (!args[0]) {
+        server.sendChatText(client, "Usage /emote <name>");
+        return;
+      }
 
-        if (!server.isPvE) {
-          switch (animationId) {
-            case 18:
-            case 21:
-            case 29:
-            case 30:
-            case 39:
-            case 88:
-            case 34:
-            case 35:
-            case 43:
-            case 46:
-            case 51:
-            case 58:
-            case 68:
-            case 95:
-            case 97:
-            case 101:
-            case 102:
-              server.sendChatText(
-                client,
-                "[ERROR] This emote has been disabled due to abuse."
-              );
-              return;
-          }
-        }
+      const emoteName = args[0].toLowerCase();
+      const animationId = emoteMap[emoteName];
+
+      if (!animationId) {
+        server.sendChatText(
+          client,
+          `Unknown emote: ${args[0]}. Use /emotelist to see available emotes.`
+        );
+        return;
+      }
+
+      // Check if this emote is in the allowed list (no ownership check needed)
+      if (defaultEmotes.includes(animationId)) {
         server.sendDataToAllWithSpawnedEntity(
           server._characters,
           client.character.characterId,
@@ -524,12 +514,89 @@ export const commands: Array<Command> = [
             animationId: animationId
           }
         );
-      } else {
-        server.sendChatText(
-          client,
-          "[ERROR] Emotes are currently disabled in PvP servers."
+        return;
+      }
+
+      // Check if player owns the emote as an account item
+      let hasEmote = false;
+
+      // Check all account items for emote
+      const accountItems =
+        await server.accountInventoriesManager.getAccountItems(
+          client.loginSessionId
         );
+      for (const accountItem of accountItems) {
+        if (accountItem && accountItem.itemDefinitionId) {
+          const itemDef = server.getItemDefinition(
+            accountItem.itemDefinitionId
+          );
+          if (itemDef && itemDef.PARAM1 === animationId) {
+            hasEmote = true;
+            break;
+          }
+        }
+      }
+
+      if (!hasEmote) {
+        server.sendChatText(client, "[ERROR] You don't own this emote");
+        return;
       }
+
+      server.sendDataToAllWithSpawnedEntity(
+        server._characters,
+        client.character.characterId,
+        "Animation.Play",
+        {
+          characterId: client.character.characterId,
+          animationId: animationId
+        }
+      );
+    }
+  },
+  {
+    name: "emotelist",
+    permissionLevel: PermissionLevels.DEFAULT,
+    execute: async (
+      server: ZoneServer2016,
+      client: Client,
+      args: Array<string>
+    ) => {
+      const ownedEmotes: string[] = [];
+
+      // Add default emotes that don't require ownership
+      for (const [emoteName, animationId] of Object.entries(emoteMap)) {
+        if (defaultEmotes.includes(animationId)) {
+          ownedEmotes.push(emoteName);
+        }
+      }
+
+      // Check account items for owned emotes
+      const accountItems =
+        await server.accountInventoriesManager.getAccountItems(
+          client.loginSessionId
+        );
+      for (const accountItem of accountItems) {
+        if (accountItem && accountItem.itemDefinitionId) {
+          const itemDef = server.getItemDefinition(
+            accountItem.itemDefinitionId
+          );
+          if (itemDef && itemDef.PARAM1) {
+            // Find emote name by animation ID
+            for (const [emoteName, animationId] of Object.entries(emoteMap)) {
+              if (
+                animationId === itemDef.PARAM1 &&
+                !defaultEmotes.includes(animationId)
+              ) {
+                ownedEmotes.push(emoteName);
+                break;
+              }
+            }
+          }
+        }
+      }
+
+      server.sendChatText(client, "Available emotes:", true);
+      server.sendChatText(client, ownedEmotes.sort().join(", "));
     }
   },
   {
@@ -1793,6 +1860,27 @@ export const commands: Array<Command> = [
       server.sendAlert(client, `Set debug mode to ${client.isDebugMode}`);
     }
   },
+  {
+    name: "setmaxpacketloss",
+    permissionLevel: PermissionLevels.ADMIN,
+    execute: (server: ZoneServer2016, client: Client, args: Array<string>) => {
+      if (!args[0]) {
+        server.sendChatText(client, "You must specify a value");
+        return;
+      }
+      const packetloss = Number(args[0]);
+      if (packetloss < 1) {
+        server.sendChatText(client, "Minimum packet loss to specify is 1");
+        return;
+      }
+      server.sendChatText(
+        client,
+        `Max packet loss set to ${packetloss} from ${server.maxPacketLoss}`,
+        false
+      );
+      server.maxPacketLoss = packetloss;
+    }
+  },
   {
     name: "heal",
     permissionLevel: PermissionLevels.MODERATOR,

package/src/servers/ZoneServer2016/zonepackethandlers.ts

@@ -323,6 +323,18 @@ export class ZonePacketHandlers {
     if (!server.hookManager.checkHook("OnClientFinishedLoading", client)) {
       return;
     }
+
+    if (!client.firstLoading) {
+      setTimeout(() => {
+        const soeClient = server._gatewayServer._soeServer.getSoeClient(
+          client.soeClientId
+        );
+        if (soeClient) {
+          soeClient.finishedLoading = true;
+        }
+      }, 5000);
+    }
+
     if (client.character.awaitingTeleportLocation) {
       const awaitingPos = client.character.awaitingTeleportLocation;
       setTimeout(() => {

package/src/servers/ZoneServer2016/zoneserver.ts

@@ -7940,7 +7940,7 @@ export class ZoneServer2016 extends EventEmitter {
       itemDefinition.ID,
       overrideProjectileId
         ? packet.packet.sessionProjectileCount +
-            parseInt(client.character.characterId.slice(-5), 16)
+          parseInt(client.character.characterId.slice(-5), 16)
         : packet.packet.projectileUniqueId,
       client.character.characterId
     );