From 74ae4d2723ddef819ec498547dc9599598eb1e67 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Thu, 21 Nov 2019 09:35:19 +0100 Subject: [PATCH 1/2] Fix permabones config check --- .../deathindicator/DeathIndicatorPlugin.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java index b1f2cfb0a3..a525d14baa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java @@ -229,24 +229,24 @@ public class DeathIndicatorPlugin extends Plugin private void onPlayerDeath(PlayerDeath death) { - if (client.isInInstancedRegion() || death.getPlayer().getWorldLocation().getRegionID() == 13362) + if (client.isInInstancedRegion()) { return; } - if (death.getPlayer() != client.getLocalPlayer()) + final Player player = death.getPlayer(); + + if (config.permaBones() && player.getWorldLocation().getRegionID() != 13362) + { + newBoneFor(player); + } + + if (player != client.getLocalPlayer()) { - newBoneFor(death.getPlayer()); return; } - Player lp = client.getLocalPlayer(); - if (config.permaBones()) - { - newBoneFor(lp); - } - - lastDeath = lp.getWorldLocation(); + lastDeath = player.getWorldLocation(); lastDeathWorld = client.getWorld(); lastDeathTime = Instant.now(); } From 0322923895da2cfc26bc44c0052f24ab49205214 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Thu, 21 Nov 2019 10:00:04 +0100 Subject: [PATCH 2/2] Attackstyles: Add @VisibleForTesting annotations and lombokify --- .../attackstyles/AttackStylesPlugin.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index e32be3082b..409f10435c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -70,8 +70,11 @@ public class AttackStylesPlugin extends Plugin private int attackStyleVarbit = -1; private int equippedWeaponTypeVarbit = -1; private int castingModeVarbit = -1; + @Getter + @Nullable private AttackStyle attackStyle; private final Set warnedSkills = new HashSet<>(); + @Getter(AccessLevel.PACKAGE) private boolean warnedSkillSelected = false; private final Table widgetsToHide = HashBasedTable.create(); @@ -108,6 +111,7 @@ public class AttackStylesPlugin extends Plugin private boolean warnForRanged; private boolean warnForMagic; private boolean hideAutoRetaliate; + @VisibleForTesting boolean removeWarnedStyles; @Override @@ -159,17 +163,7 @@ public class AttackStylesPlugin extends Plugin eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); } - @Nullable - public AttackStyle getAttackStyle() - { - return attackStyle; - } - - boolean isWarnedSkillSelected() - { - return warnedSkillSelected; - } - + @VisibleForTesting void onWidgetHiddenChanged(WidgetHiddenChanged event) { if (event.getWidget().isSelfHidden() || TO_GROUP(event.getWidget().getId()) != COMBAT_GROUP_ID) @@ -215,6 +209,7 @@ public class AttackStylesPlugin extends Plugin } } + @VisibleForTesting void onVarbitChanged(VarbitChanged event) { int currentAttackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE); @@ -240,6 +235,7 @@ public class AttackStylesPlugin extends Plugin } } + @VisibleForTesting void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("attackIndicator"))