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

xp globes: fix timing out xp globes after no xp is gained

Browse Source 
The overlay was clobbering the plugins sorted xpglobe list when it
re-sorted it by skill instead, preventing the expire routine from
correctly expiring xpglobes. Instead keep the list in render order (by
skill) and just check the full list for expired orbs, since there are
not usually many to check.
This commit is contained in:
Adam
2020-08-21 18:46:03 -04:00
parent 408df21f2e
commit ad940f51ee
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
View File

@@ -96,17 +96,15 @@ public class XpGlobesOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
final int queueSize = plugin.getXpGlobesSize();
final List<XpGlobe> xpGlobes = plugin.getXpGlobes();
final int queueSize = xpGlobes.size();
if (queueSize == 0)
{
return null;
}
final List<XpGlobe> sortedXpGlobes = plugin.getXpGlobes();
sortedXpGlobes.sort((a, b) -> a.getSkill().compareTo(b.getSkill()));
int curDrawX = 0;
for (final XpGlobe xpGlobe : sortedXpGlobes)
for (final XpGlobe xpGlobe : xpGlobes)
{
int startXp = xpTrackerService.getStartGoalXp(xpGlobe.getSkill());
int goalXp = xpTrackerService.getEndGoalXp(xpGlobe.getSkill());

44
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
View File

@@ -28,7 +28,8 @@ import com.google.inject.Provides;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import javax.inject.Inject;
import lombok.Getter;
@@ -118,7 +119,7 @@ public class XpGlobesPlugin extends Plugin
cachedGlobe.setCurrentXp(currentXp);
cachedGlobe.setCurrentLevel(currentLevel);
cachedGlobe.setTime(Instant.now());
this.addXpGlobe(globeCache[skillIdx], MAXIMUM_SHOWN_GLOBES);
addXpGlobe(globeCache[skillIdx]);
}
else
{
@@ -127,20 +128,22 @@ public class XpGlobesPlugin extends Plugin
}
}
private void addXpGlobe(XpGlobe xpGlobe, int maxLength)
private void addXpGlobe(XpGlobe xpGlobe)
{
//remove the old globe, allowing it to be readded as the most recent (right) side when drawn
xpGlobes.remove(xpGlobe);
if (getXpGlobesSize() >= maxLength)
// insert the globe, ordered by skill, if it isn't already in the list to be drawn
int idx = Collections.binarySearch(xpGlobes, xpGlobe, Comparator.comparing(XpGlobe::getSkill));
if (idx < 0)
{
xpGlobes.remove(0);
}
xpGlobes.add(xpGlobe);
}
xpGlobes.add(-idx - 1, xpGlobe);
int getXpGlobesSize()
{
return xpGlobes.size();
// remove the oldest globe if there are too many
if (xpGlobes.size() > MAXIMUM_SHOWN_GLOBES)
{
xpGlobes.stream()
.min(Comparator.comparing(XpGlobe::getTime))
.ifPresent(xpGlobes::remove);
}
}
}
@Schedule(
@@ -151,18 +154,9 @@ public class XpGlobesPlugin extends Plugin
{
if (!xpGlobes.isEmpty())
{
Instant currentTime = Instant.now();
for (Iterator<XpGlobe> it = xpGlobes.iterator(); it.hasNext();)
{
XpGlobe globe = it.next();
Instant globeCreationTime = globe.getTime();
if (currentTime.isBefore(globeCreationTime.plusSeconds(config.xpOrbDuration())))
{
//if a globe is not expired, stop checking newer globes
return;
}
it.remove();
}
Instant expireTime = Instant.now()
.minusSeconds(config.xpOrbDuration());
xpGlobes.removeIf(globe -> globe.getTime().isBefore(expireTime));
}
}