diff --git a/runelite-api/src/main/java/net/runelite/api/Hitsplat.java b/runelite-api/src/main/java/net/runelite/api/Hitsplat.java index cb8290d56f..c44bf2dd1b 100644 --- a/runelite-api/src/main/java/net/runelite/api/Hitsplat.java +++ b/runelite-api/src/main/java/net/runelite/api/Hitsplat.java @@ -37,13 +37,21 @@ public class Hitsplat public enum HitsplatType { /** - * Blocking damage (blue). + * Blocking damage by me (blue). */ - BLOCK, + BLOCK_ME, /** - * Taking damage (red). + * Blocking damage by others (blue). */ - DAMAGE, + BLOCK_OTHER, + /** + * Taking damage by me (red). + */ + DAMAGE_ME, + /** + * Taking damage by others (red). + */ + DAMAGE_OTHER, /** * Damage from poison (green). */ @@ -72,8 +80,10 @@ public class Hitsplat { switch (type) { - case 0: return BLOCK; - case 1: return DAMAGE; + case 12: return BLOCK_ME; + case 13: return BLOCK_OTHER; + case 16: return DAMAGE_ME; + case 17: return DAMAGE_OTHER; case 2: return POISON; case 4: return DISEASE; case 5: return VENOM; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 637c9e442a..1e26314f00 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -361,8 +361,8 @@ public class IdleNotifierPlugin extends Plugin final Hitsplat hitsplat = event.getHitsplat(); - if (hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE - || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK) + if (hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE_ME + || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK_ME) { lastCombatCountdown = HIGHEST_MONSTER_ATTACK_SPEED; } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java index a722f6a447..59c84d3086 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java @@ -250,7 +250,7 @@ public class IdleNotifierPluginTest // But player is being damaged (is in combat) final HitsplatApplied hitsplatApplied = new HitsplatApplied(); hitsplatApplied.setActor(player); - hitsplatApplied.setHitsplat(new Hitsplat(Hitsplat.HitsplatType.DAMAGE, 0, 0)); + hitsplatApplied.setHitsplat(new Hitsplat(Hitsplat.HitsplatType.DAMAGE_ME, 0, 0)); plugin.onHitsplatApplied(hitsplatApplied); plugin.onGameTick(new GameTick()); verify(notifier, times(0)).notify(any());