From c2cb359bf783617d4a66a25b3cc7ba02c283bb1e Mon Sep 17 00:00:00 2001 From: Ceikry Date: Fri, 3 Mar 2023 12:54:45 +0000 Subject: [PATCH] Fixed a null reference exception due to misuse of combat callbacks to update interfaces --- Server/src/main/content/minigame/pestcontrol/PCPortalNPC.java | 2 +- .../content/minigame/pestcontrol/monsters/PCSpinnerNPC.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Server/src/main/content/minigame/pestcontrol/PCPortalNPC.java b/Server/src/main/content/minigame/pestcontrol/PCPortalNPC.java index 64dfbcb60..0bddb9a24 100644 --- a/Server/src/main/content/minigame/pestcontrol/PCPortalNPC.java +++ b/Server/src/main/content/minigame/pestcontrol/PCPortalNPC.java @@ -88,7 +88,7 @@ public final class PCPortalNPC extends AbstractNPC { /** * If the lifepoints should be updated. */ - private boolean updateLifepoints = true; + public boolean updateLifepoints = true; /** * The pest control session. diff --git a/Server/src/main/content/minigame/pestcontrol/monsters/PCSpinnerNPC.java b/Server/src/main/content/minigame/pestcontrol/monsters/PCSpinnerNPC.java index d2c667dd6..a2da842b6 100644 --- a/Server/src/main/content/minigame/pestcontrol/monsters/PCSpinnerNPC.java +++ b/Server/src/main/content/minigame/pestcontrol/monsters/PCSpinnerNPC.java @@ -1,5 +1,6 @@ package content.minigame.pestcontrol.monsters; +import content.minigame.pestcontrol.PCPortalNPC; import content.minigame.pestcontrol.PestControlSession; import core.game.interaction.MovementPulse; import core.game.node.entity.Entity; @@ -90,7 +91,7 @@ public final class PCSpinnerNPC extends AbstractNPC { faceTemporary(portal, 1); visualize(new Animation(3911, Priority.HIGH), Graphics.create(658)); portal.getSkills().heal(portal.getSkills().getMaximumLifepoints() / 10); - portal.onImpact(this, null); + ((PCPortalNPC) portal).updateLifepoints = true; } /**