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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Owain van Brakel
2019-11-08 04:58:54 +01:00
parent 7866cc612b d9d8ebb1b0
commit a272c7511f
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -389,6 +389,11 @@ public class ClueScrollPlugin extends Plugin
for (WorldPoint location : locations)
{
if (location == null)
{
continue;
}
// Only set the location hint arrow if we do not already have more accurate location
if (location.isInScene(client)
&& this.displayHintArrows

4
runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java
View File

@@ -24,10 +24,10 @@
*/
package net.runelite.client.plugins.raidsthieving.BatSolver;
import java.util.HashMap;
import java.util.Map;
import net.runelite.api.Point;
import net.runelite.client.plugins.raidsthieving.ThievingChest;
import java.util.HashMap;
public class ChestIdentifier
{
@@ -251,7 +251,7 @@ public class ChestIdentifier
public void indentifyChest(ThievingChest chest)
{
int id = chestIds.get(chest.getInstancePoint());
int id = chestIds.getOrDefault(chest.getInstancePoint(), -1);
chest.setChestId(id);
}

2
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java
View File

@@ -192,7 +192,7 @@ public class ScreenMarkerPlugin extends Plugin
public void finishCreation(boolean aborted)
{
if (!aborted)
if (!aborted && currentMarker != null)
{
final ScreenMarkerOverlay screenMarkerOverlay = new ScreenMarkerOverlay(currentMarker);
screenMarkerOverlay.setPreferredLocation(overlay.getBounds().getLocation());