h1z1-server 0.47.4-8 → 0.47.4-9

package/package.json

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

package/src/servers/ZoneServer2016/managers/constructionmanager.ts

@@ -22,7 +22,6 @@ import {
   fixEulerOrder,
   getConstructionSlotId,
   getDistance,
-  isPosInPoi,
   isPosInRadius,
   isPosInRadiusWithY,
   movePoint
@@ -380,6 +379,7 @@ export class ConstructionManager {
     return false;
   }
   detectPOIPlacement(
+    server: ZoneServer2016,
     itemDefinitionId: number,
     position: Float32Array,
     client: Client,
@@ -388,7 +388,7 @@ export class ConstructionManager {
     if (client.isDebugMode) return false;
     if (this.overridePlacementItems.includes(itemDefinitionId)) return false;
 
-    const isInPoi = isPosInPoi(position);
+    const isInPoi = server.isPosInPoi(position);
     // allow placement in poi if object is parented to a foundation
     if (isInPoi && !isInsidePermissionedFoundation) {
       return true;
@@ -447,6 +447,7 @@ export class ConstructionManager {
     if (
       server.isNoBuildInPois &&
       this.detectPOIPlacement(
+        server,
         itemDefinitionId,
         position,
         client,

package/src/servers/ZoneServer2016/managers/rewardmanager.ts

@@ -15,7 +15,7 @@ import { setInterval } from "timers";
 import { ZoneServer2016 } from "../zoneserver";
 import { AccountItems } from "../models/enums";
 import { ZoneClient2016 } from "../classes/zoneclient";
-import { isHalloween, isPosInPoi } from "../../../utils/utils";
+import { isHalloween } from "../../../utils/utils";
 
 interface Reward {
   itemId: AccountItems;
@@ -194,7 +194,7 @@ export class RewardManager {
       if (
         client.character.playTime - client.character.lastDropPlaytime >
           (isHalloween() ? 60 : 120) &&
-        isPosInPoi(client.character.state.position)
+        this.server.isPosInPoi(client.character.state.position)
       ) {
         this.dropPlayTimeReward(client);
       }

package/src/servers/ZoneServer2016/zoneserver.ts

@@ -105,7 +105,8 @@ import {
   flhash,
   getDateString,
   chance,
-  quat2heading
+  quat2heading,
+  isInsideSquare
 } from "../../utils/utils";
 
 import { Db, MongoClient, WithId } from "mongodb";
@@ -9893,6 +9894,27 @@ export class ZoneServer2016 extends EventEmitter {
   isBattleRoyale(): boolean {
     return this.gameMode > 0;
   }
+
+  isPosInPoi(position: Float32Array): boolean {
+    let isInPoi = false;
+    Z1_POIs.forEach((point: any) => {
+      let useRange = true;
+      if (point.bounds) {
+        useRange = false;
+        point.bounds.forEach((bound: any) => {
+          if (isInsideSquare([position[0], position[2]], bound)) {
+            isInPoi = true;
+            return;
+          }
+        });
+      }
+      if (useRange && isPosInRadius(point.range, position, point.position)) {
+        isInPoi = true;
+      }
+    });
+
+    return isInPoi;
+  }
 }
 
 if (process.env.VSCODE_DEBUG === "true") {

package/src/utils/utils.ts

@@ -34,7 +34,6 @@ import { ZoneClient2016 } from "servers/ZoneServer2016/classes/zoneclient";
 import * as crypto from "crypto";
 import { ZoneClient } from "servers/ZoneServer2015/classes/zoneclient";
 import { ConstructionDoor } from "../servers/ZoneServer2016/entities/constructiondoor";
-import { PluginManager } from "../servers/ZoneServer2016/managers/pluginmanager";
 
 const startTime = Date.now();
 
@@ -1685,28 +1684,6 @@ export function luck(l: number) {
   return Math.floor(Math.random() * l) === 0;
 }
 
-const Z1_POIs = PluginManager.loadServerData("2016/zoneData/Z1_POIs");
-export function isPosInPoi(position: Float32Array): boolean {
-  let isInPoi = false;
-  Z1_POIs.forEach((point: any) => {
-    let useRange = true;
-    if (point.bounds) {
-      useRange = false;
-      point.bounds.forEach((bound: any) => {
-        if (isInsideSquare([position[0], position[2]], bound)) {
-          isInPoi = true;
-          return;
-        }
-      });
-    }
-    if (useRange && isPosInRadius(point.range, position, point.position)) {
-      isInPoi = true;
-    }
-  });
-
-  return isInPoi;
-}
-
 export function chance(chanceNum: number): boolean {
   return Math.random() * 1000 < chanceNum;
 }