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

discord: don't throw NPE when checking timeout on training states

Browse Source
This commit is contained in:
Max Weber
2020-03-10 02:03:11 -06:00
parent 480a5ab921
commit 27adfd4f11
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
View File

@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Nullable;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -285,15 +286,26 @@ enum DiscordGameEventType
FROM_VARBITS = fromVarbitsBuilder.build(); FROM_VARBITS = fromVarbitsBuilder.build();
} }
@Nullable
private String imageKey; private String imageKey;
@Nullable
private String state; private String state;
@Nullable
private String details; private String details;
private int priority; private int priority;
private boolean shouldClear; private boolean shouldClear;
private boolean shouldTimeout; private boolean shouldTimeout;
@Nullable
private DiscordAreaType discordAreaType; private DiscordAreaType discordAreaType;
@Nullable
private Varbits varbits; private Varbits varbits;
@Nullable
private int[] regionIds; private int[] regionIds;
DiscordGameEventType(Skill skill) DiscordGameEventType(Skill skill)
@@ -306,7 +318,6 @@ enum DiscordGameEventType
this.details = training(skill); this.details = training(skill);
this.priority = priority; this.priority = priority;
this.imageKey = imageKeyOf(skill); this.imageKey = imageKeyOf(skill);
this.priority = priority;
this.shouldTimeout = true; this.shouldTimeout = true;
} }

3
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java
View File

@@ -212,7 +212,8 @@ class DiscordState
events.removeIf(event -> event.getType().isShouldTimeout() && now.isAfter(event.getUpdated().plus(actionTimeout))); events.removeIf(event -> event.getType().isShouldTimeout() && now.isAfter(event.getUpdated().plus(actionTimeout)));
if (eventWithTime.getType().getState().equals(DiscordGameEventType.IN_MENU.getState()) && now.isAfter(eventWithTime.getStart().plus(actionTimeout))) assert DiscordGameEventType.IN_MENU.getState() != null;
if (DiscordGameEventType.IN_MENU.getState().equals(eventWithTime.getType().getState()) && now.isAfter(eventWithTime.getStart().plus(actionTimeout)))
{ {
final DiscordPresence presence = lastPresence final DiscordPresence presence = lastPresence
.toBuilder() .toBuilder()