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

mta: Merge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 15:49:20 +02:00
parent 31990d7a4d
commit 43f48afd5e
2 changed files with 27 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
View File

@@ -37,22 +37,7 @@ import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameObject; import net.runelite.api.GameObject;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import static net.runelite.api.ObjectID.CUPBOARD_23678; import static net.runelite.api.ObjectID.*;
import static net.runelite.api.ObjectID.CUPBOARD_23679;
import static net.runelite.api.ObjectID.CUPBOARD_23680;
import static net.runelite.api.ObjectID.CUPBOARD_23681;
import static net.runelite.api.ObjectID.CUPBOARD_23682;
import static net.runelite.api.ObjectID.CUPBOARD_23683;
import static net.runelite.api.ObjectID.CUPBOARD_23684;
import static net.runelite.api.ObjectID.CUPBOARD_23685;
import static net.runelite.api.ObjectID.CUPBOARD_23686;
import static net.runelite.api.ObjectID.CUPBOARD_23687;
import static net.runelite.api.ObjectID.CUPBOARD_23688;
import static net.runelite.api.ObjectID.CUPBOARD_23689;
import static net.runelite.api.ObjectID.CUPBOARD_23690;
import static net.runelite.api.ObjectID.CUPBOARD_23691;
import static net.runelite.api.ObjectID.CUPBOARD_23692;
import static net.runelite.api.ObjectID.CUPBOARD_23693;
import net.runelite.api.Perspective; import net.runelite.api.Perspective;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Point; import net.runelite.api.Point;
@@ -240,43 +225,37 @@ public class AlchemyRoom extends MTARoom
String message = wrapper.getMessage(); String message = wrapper.getMessage();
if (wrapper.getType() == ChatMessageType.GAMEMESSAGE) if (wrapper.getType() == ChatMessageType.GAMEMESSAGE && message.contains(YOU_FOUND))
{ {
if (message.contains(YOU_FOUND)) String item = message.replace(YOU_FOUND, "").trim();
AlchemyItem alchemyItem = AlchemyItem.find(item);
Cupboard clicked = getClicked();
if (clicked.alchemyItem != alchemyItem && alchemyItem != null)
{ {
String item = message.replace(YOU_FOUND, "").trim(); fill(clicked, alchemyItem);
AlchemyItem alchemyItem = AlchemyItem.find(item);
Cupboard clicked = getClicked();
if (clicked.alchemyItem != alchemyItem)
{
if (alchemyItem != null)
{
fill(clicked, alchemyItem);
}
}
} }
else if (message.equals(EMPTY)) }
else if (message.equals(EMPTY))
{
Cupboard clicked = getClicked();
int idx = Arrays.asList(cupboards).indexOf(clicked);
for (int i = -2; i <= 2; ++i)
{ {
Cupboard clicked = getClicked(); int j = (idx + i) % 8;
if (j < 0)
int idx = Arrays.asList(cupboards).indexOf(clicked);
for (int i = -2; i <= 2; ++i)
{ {
int j = (idx + i) % 8; j = 8 + j;
if (j < 0)
{
j = 8 + j;
}
Cupboard cupboard = cupboards[j];
if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN)
{
cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY;
}
} }
clicked.alchemyItem = AlchemyItem.EMPTY; Cupboard cupboard = cupboards[j];
if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN)
{
cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY;
}
} }
clicked.alchemyItem = AlchemyItem.EMPTY;
} }
} }

9
runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
View File

@@ -83,13 +83,10 @@ public class GraveyardRoom extends MTARoom
@Subscribe @Subscribe
public void onGameTick(GameTick tick) public void onGameTick(GameTick tick)
{ {
if (!inside() || !this.graveyard) if ((!inside() || !this.graveyard) && this.counter != null)
{ {
if (this.counter != null) infoBoxManager.removeIf(e -> e instanceof GraveyardCounter);
{ this.counter = null;
infoBoxManager.removeIf(e -> e instanceof GraveyardCounter);
this.counter = null;
}
} }
} }