gradle: update mockito

Mockito-all is discontinued
This commit is contained in:
Owain van Brakel
2019-07-27 07:41:56 +02:00
parent ff50dc5272
commit 3fd16bbea1
32 changed files with 155 additions and 114 deletions

View File

@@ -119,8 +119,11 @@ public class PluginManager
this.executor = executor;
this.sceneTileManager = sceneTileManager;
eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen);
eventBus.subscribe(SessionClose.class, this, this::onSessionClose);
if (eventBus != null)
{
eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen);
eventBus.subscribe(SessionClose.class, this, this::onSessionClose);
}
}
public void watch()

View File

@@ -1034,6 +1034,11 @@ public class SlayerPlugin extends Plugin
rebuildCheckAsTokens(task);
rebuildTargetList();
if (task == null)
{
return;
}
if (!weaknessOverlayAttached && task.getWeaknessItem() != -1 && task.getWeaknessThreshold() != -1)
{
overlayManager.add(targetWeaknessOverlay);