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-28 22:18:03 +01:00
parent e214805aa9 67df566342
commit 23c74ea2e4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/flexo/Flexo.java
View File

@@ -59,7 +59,7 @@ public class Flexo extends Robot
public static final int fixedWidth = Constants.GAME_FIXED_WIDTH; public static final int fixedWidth = Constants.GAME_FIXED_WIDTH;
public static final int fixedHeight = Constants.GAME_FIXED_HEIGHT; public static final int fixedHeight = Constants.GAME_FIXED_HEIGHT;
public static boolean isStretched; public static boolean isStretched;
public static final int minDelay = 45; public static int minDelay = 45;
public static MouseMotionFactory currentMouseMotionFactory; public static MouseMotionFactory currentMouseMotionFactory;
public boolean pausedIndefinitely = false; public boolean pausedIndefinitely = false;
private Robot peer; private Robot peer;

11
runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
View File

@@ -122,10 +122,9 @@ public class LearnToClickPlugin extends Plugin
MenuEntry[] menuEntries = client.getMenuEntries(); MenuEntry[] menuEntries = client.getMenuEntries();
for (MenuEntry entry : menuEntries) for (MenuEntry entry : menuEntries)
{ {
if ((entry.getOption().equals("Floating") && this.shouldRightClickMap) || if ((entry.getOption().equals("Floating <col=ff9040>World Map</col>") && this.shouldRightClickMap) ||
(entry.getOption().equals("Hide") && this.shouldRightClickXp) || (entry.getOption().equals("Show") (entry.getTarget().equals("<col=ff9040>XP drops</col>") && this.shouldRightClickXp) ||
&& this.shouldRightClickXp) || (entry.getOption().equals("Auto retaliate") (entry.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate))
&& this.shouldRightClickRetaliate))
{ {
event.setForceRightClick(true); event.setForceRightClick(true);
return; return;
@@ -136,8 +135,8 @@ public class LearnToClickPlugin extends Plugin
@Subscribe @Subscribe
private void onMenuEntryAdded(MenuEntryAdded event) private void onMenuEntryAdded(MenuEntryAdded event)
{ {
if ((event.getOption().equals("Floating") && this.shouldRightClickMap) || (event.getOption().equals("Hide") if ((event.getOption().equals("Floating <col=ff9040>World Map</col>") && this.shouldRightClickMap) ||
&& this.shouldRightClickXp) || (event.getOption().equals("Show") && this.shouldRightClickXp) || (event.getTarget().equals("<col=ff9040>XP drops</col>") && this.shouldRightClickXp) ||
(event.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate)) (event.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate))
{ {
forceRightClickFlag = true; forceRightClickFlag = true;