Skip to content

Fix: Add bounds check for slotTimers to prevent silent trade recording failure #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Reggie-Reuss wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

Fix: Add bounds check for slotTimers to prevent silent trade recording failure #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/com/flippingutilities/controller/FlippingPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,9 @@ public void setWidgetsOnSlotTimers() {
return;
}

if (accountData.getSlotTimers().size() < 8) {
return;
}
for (int slotIndex = 0; slotIndex < 8; slotIndex++) {
SlotActivityTimer timer = accountData.getSlotTimers().get(slotIndex);
if (timer == null) {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/flippingutilities/controller/NewOfferEventPipelineHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ public Optional<OfferEvent> screenOfferEvent(OfferEvent newOfferEvent) {

Map<Integer, OfferEvent> lastOfferEventForEachSlot = plugin.getDataHandler().getAccountData(plugin.getCurrentlyLoggedInAccount()).getLastOffers();
List<SlotActivityTimer> slotActivityTimers = plugin.getDataHandler().getAccountData(plugin.getCurrentlyLoggedInAccount()).getSlotTimers();
if (slotActivityTimers == null || slotActivityTimers.size() < 8) {
log.warn("slotActivityTimers is missing or undersized ({}), skipping offer screening",
slotActivityTimers == null ? "null" : slotActivityTimers.size());
return Optional.empty();
}
OfferEvent lastOfferEvent = lastOfferEventForEachSlot.get(newOfferEvent.getSlot());

//completely useless updates
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/flippingutilities/model/AccountData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private void hydrateRecipeFlipGroups(FlippingPlugin plugin) {
}

private void hydrateSlotTimers(FlippingPlugin plugin) {
if (slotTimers == null) {
if (slotTimers == null || slotTimers.size() != 8) {
slotTimers = setupSlotTimers(plugin);
} else {
slotTimers.forEach(timer -> {
Expand Down