Merge pull request #166 from rune-js/feature/fix-damage-flag

Fixing an issue where the damage update flag wouldn't trigger an update
runejs · Jun 6, 2020 · 211a0a9 · 211a0a9
2 parents a04137c + 34e2b93
commit 211a0a9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/plugins/combat/combat.js b/plugins/combat/combat.js
@@ -1,14 +1,14 @@
-const { NPC_ACTION, DamageType, wait } = require('../rune.js');
+const { NPC_ACTION, DamageType, schedule } = require('../rune.js');
 
 const action = async details => {
     const { player, npc } = details;
 
     npc.updateFlags.addDamage(1, DamageType.DAMAGE, 4, 5);
     npc.say(`Ow!`);
 
-    await wait(100);
+    await schedule(4);
 
-    player.updateFlags.addDamage(1, DamageType.DAMAGE, 9, 10);
+    player.updateFlags.addDamage(1, DamageType.DAMAGE, 4, 5);
 };
 
 module.exports = {

diff --git a/plugins/rune.js b/plugins/rune.js
@@ -13,8 +13,7 @@ const { InteractingAction, loopingAction, walkToAction } = require('../dist/worl
 const { DamageType, Damage, Animation, Graphic, ChatMessage } = require('../dist/world/actor/update-flags');
 const { Skill, Skills } = require('../dist/world/actor/skills');
 const { Achievements, giveAchievement } = require('../dist/world/actor/player/achievements');
-const { of } = require('rxjs');
-const { delay } = require('rxjs/operators');
+const { wait, schedule } = require('../dist/task/task');
 
 module.exports = {
 
@@ -33,8 +32,6 @@ module.exports = {
 
     DamageType, Damage, Animation, Graphic, ChatMessage, Skill, Skills, Achievements, giveAchievement,
 
-    wait: async (waitLength) => {
-        await of(null).pipe(delay(waitLength)).toPromise();
-    }
+    wait, schedule
 
 };
diff --git a/src/task/task.ts b/src/task/task.ts
@@ -1,5 +1,6 @@
-import { timer } from 'rxjs';
+import { of, timer } from 'rxjs';
 import { World } from '@server/world/world';
+import { delay } from 'rxjs/operators';
 
 export abstract class Task<T> {
 
@@ -10,3 +11,7 @@ export abstract class Task<T> {
 export const schedule = async (ticks: number): Promise<number> => {
     return timer(ticks * World.TICK_LENGTH).toPromise();
 };
+
+export const wait = async (waitLength): Promise<void> => {
+    return of(null).pipe(delay(waitLength)).toPromise();
+};
diff --git a/src/world/actor/update-flags.ts b/src/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._graphics !== null || this._animation !== undefined || this._faceActor !== undefined || this._damage !== null;
     }
 
     public get mapRegionUpdateRequired(): boolean {