fix issue with lastWhisperedPlayer being undefined (#1983)

QuentinGruber · Mar 2, 2024 · 2f7462a · 2f7462a
2 parents 18a65d2 + b9d4aa3
commit 2f7462a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/servers/ZoneServer2016/entities/character.ts b/src/servers/ZoneServer2016/entities/character.ts
@@ -125,7 +125,7 @@ export class Character2016 extends BaseFullCharacter {
   isReady = false;
   creationDate!: string;
   lastLoginDate!: string;
-  lastWhisperedPlayer!: string;
+  lastWhisperedPlayer?: string;
   hasAlertedBees = false;
   vehicleExitDate: number = new Date().getTime();
   currentLoadoutSlot = LoadoutSlots.FISTS;

diff --git a/src/servers/ZoneServer2016/handlers/commands/commands.ts b/src/servers/ZoneServer2016/handlers/commands/commands.ts
@@ -416,6 +416,10 @@ export const commands: Array<Command> = [
         server.sendChatText(client, "[Reply] The message may not be blank!");
         return;
       }
+      if (!client.character.lastWhisperedPlayer) {
+        server.sendChatText(client, "[Reply] No one has whispered you yet.");
+        return;
+      }
 
       let targetClient = server.getClientByNameOrLoginSession(
         client.character.lastWhisperedPlayer

diff --git a/src/servers/ZoneServer2016/managers/constructionmanager.ts b/src/servers/ZoneServer2016/managers/constructionmanager.ts
@@ -2100,7 +2100,7 @@ export class ConstructionManager {
     server.updateResource(
       client,
       entity.characterId,
-      (entity.maxHealth / entity.health) * 1000000,
+      (entity.health / entity.maxHealth) * 1000000,
       ResourceIds.CONSTRUCTION_CONDITION,
       ResourceTypes.CONDITION
     );