Merge pull request #402 from Jameskmonger/small-fixes

fix: two small fixes
runejs · Jul 9, 2023 · 7337e02 · 7337e02
2 parents 0196052 + 06d7d3e
commit 7337e02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/engine/world/actor/player/sync/player-sync-task.ts b/src/engine/world/actor/player/sync/player-sync-task.ts
@@ -125,7 +125,7 @@ export class PlayerSyncTask extends SyncTask<void> {
         if(updateFlags.graphics) {
             mask |= 0x200;
         }
-        if(updateFlags.animation !== undefined) {
+        if(updateFlags.animation !== undefined && updateFlags.animation !== null) {
             mask |= 0x1;
         }
 
@@ -151,7 +151,7 @@ export class PlayerSyncTask extends SyncTask<void> {
             updateMaskData.put(position.y * 2 + 1, 'SHORT', 'LITTLE_ENDIAN');
         }
 
-        if(updateFlags.animation !== undefined) {
+        if(updateFlags.animation !== undefined && updateFlags.animation !== null) {
             const animation = updateFlags.animation;
 
             if(animation === null || animation.id === -1) {

diff --git a/src/engine/world/actor/update-flags.ts b/src/engine/world/actor/update-flags.ts
@@ -95,7 +95,7 @@ export class UpdateFlags {
 
     public get updateBlockRequired(): boolean {
         return this._appearanceUpdateRequired || this._chatMessages.length !== 0 || this._facePosition !== null ||
-            this._graphics !== null || this._animation !== undefined || this._faceActor !== undefined || this._damage !== null;
+            this._graphics !== null || (this._animation !== undefined && this._animation !== null) || (this._faceActor !== undefined && this._faceActor !== null) || this._damage !== null;
     }
 
     public get mapRegionUpdateRequired(): boolean {

diff --git a/src/engine/world/world.ts b/src/engine/world/world.ts
@@ -519,7 +519,7 @@ export class World {
     public playerOnline(player: Player | string): boolean {
         if(typeof player === 'string') {
             player = player.toLowerCase();
-            return this.playerList.findIndex(p => p !== null && p.username.toLowerCase() === player) !== -1;
+            return this.playerList.findIndex(p => Boolean(p) && p.username.toLowerCase() === player) !== -1;
         } else {
             const foundPlayer = this.playerList[player.worldIndex];
             if(!foundPlayer) {