api: update for tinted block and damage hitsplats

This commit is contained in:
Adam
2020-03-05 07:11:25 -05:00
parent b60d5428cf
commit 7c3ff105fb
3 changed files with 19 additions and 9 deletions

View File

@@ -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;
}

View File

@@ -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());