ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

barbarianassault: Combine nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 02:18:30 +02:00
parent b880a9bb40
commit 4203905cce
2 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
View File

@@ -29,7 +29,6 @@ package net.runelite.client.plugins.barbarianassault;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.Color; import java.awt.Color;
import java.awt.Font; import java.awt.Font;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
@@ -42,12 +41,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor; import net.runelite.api.Actor;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -760,14 +757,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
String name = event.getNpc().getName(); String name = event.getNpc().getName();
if (name.equals("Penance Healer")) if (name.equals("Penance Healer") && !healers.containsKey(npc.getIndex()))
{
if (!healers.containsKey(npc.getIndex()))
{ {
healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage)); healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage));
} }
} }
}
@Subscribe @Subscribe
public void onNpcDespawned(NpcDespawned event) public void onNpcDespawned(NpcDespawned event)
@@ -1160,16 +1154,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
String target = Text.removeTags(event.getTarget()).toLowerCase(); String target = Text.removeTags(event.getTarget()).toLowerCase();
if (getRole() == Role.HEALER) if (getRole() == Role.HEALER && (target.startsWith("poisoned meat -> penance healer")
{
if (target.startsWith("poisoned meat -> penance healer")
|| target.startsWith("poisoned tofu -> penance healer") || target.startsWith("poisoned tofu -> penance healer")
|| target.startsWith("poisoned worms -> penance healer")) || target.startsWith("poisoned worms -> penance healer")))
{ {
lastHealerPoisoned = event.getIdentifier(); lastHealerPoisoned = event.getIdentifier();
poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->"); poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->");
return;
}
} }
// INW // INW
@@ -1206,15 +1196,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
if (opponent == null) if (opponent == null)
{ {
if (lastInteracted != -1) if (lastInteracted != -1 && StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted))
{
if (StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted))
{ {
Healer healer = healers.get(lastInteracted); Healer healer = healers.get(lastInteracted);
healer.setFoodRemaining(healer.getFoodRemaining() - 1); healer.setFoodRemaining(healer.getFoodRemaining() - 1);
healer.setTimeLastPoisoned(Instant.now()); healer.setTimeLastPoisoned(Instant.now());
} }
}
lastInteracted = -1; lastInteracted = -1;
poisonUsed = null; poisonUsed = null;

5
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
View File

@@ -67,15 +67,12 @@ public class Scorecard
@Subscribe @Subscribe
public void onChatMessage(ChatMessage chatMessage) public void onChatMessage(ChatMessage chatMessage)
{ {
if (chatMessage.getMessage().startsWith("---- Points:")) if (chatMessage.getMessage().startsWith("---- Points:") && game.getStage() == 1)
{
if (game.getStage() == 1)
{ {
totalPoints = new int[6]; totalPoints = new int[6];
totalAmounts = new int[6]; totalAmounts = new int[6];
} }
} }
}
void addWave(Wave wave) void addWave(Wave wave)
{ {