illumineawake
/
illu-plugins
mirror of https://github.com/illumineawake/illu-plugins.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rooftopagility: fixed NPE from getConvexHull

This commit is contained in:
Elli-tt 2020-10-04 19:18:30 +01:00
parent adf5e7516a
commit 252821a9e6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rooftopagility/rooftopagility.gradle.kts
View File

@ -23,7 +23,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
version = "4.0.0"
version = "4.0.1"
project.extra["PluginName"] = "Rooftop Agility"
project.extra["PluginDescription"] = "Illumine automated rooftop agility plugin"

14
rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java
View File

@ -27,6 +27,7 @@ package net.runelite.client.plugins.rooftopagility;
import com.google.inject.Provides;
import com.owain.chinbreakhandler.ChinBreakHandler;
import java.awt.Rectangle;
import java.time.Duration;
import java.time.Instant;
import java.util.HashSet;
@ -339,13 +340,14 @@ public class RooftopAgilityPlugin extends Plugin {
RooftopAgilityObstacles obstacle = getCurrentObstacle();
if (obstacle != null) {
log.debug(String.valueOf(obstacle.getObstacleId()));
if (obstacle.getObstacleType() == RooftopAgilityObstacleType.DECORATION) {
DecorativeObject decObstacle = utils.findNearestDecorObject(obstacle.getObstacleId());
if (decObstacle != null) {
targetMenu = new MenuEntry("", "", decObstacle.getId(), MenuOpcode.GAME_OBJECT_FIRST_OPTION.getId(), decObstacle.getLocalLocation().getSceneX(), decObstacle.getLocalLocation().getSceneY(), false);
utils.setMenuEntry(targetMenu);
utils.delayMouseClick(decObstacle.getConvexHull().getBounds(), sleepDelay());
Rectangle clickPoint = (decObstacle.getConvexHull() != null) ? decObstacle.getConvexHull().getBounds() :
new Rectangle(client.getCenterX() - 50, client.getCenterY() - 50, 100, 100);
utils.delayMouseClick(clickPoint, sleepDelay());
return;
}
}
@ -354,7 +356,9 @@ public class RooftopAgilityPlugin extends Plugin {
if (groundObstacle != null) {
targetMenu = new MenuEntry("", "", groundObstacle.getId(), MenuOpcode.GAME_OBJECT_FIRST_OPTION.getId(), groundObstacle.getLocalLocation().getSceneX(), groundObstacle.getLocalLocation().getSceneY(), false);
utils.setMenuEntry(targetMenu);
utils.delayMouseClick(groundObstacle.getConvexHull().getBounds(), sleepDelay());
Rectangle clickPoint = (groundObstacle.getConvexHull() != null) ? groundObstacle.getConvexHull().getBounds() :
new Rectangle(client.getCenterX() - 50, client.getCenterY() - 50, 100, 100);
utils.delayMouseClick(clickPoint, sleepDelay());
return;
}
}
@ -362,7 +366,9 @@ public class RooftopAgilityPlugin extends Plugin {
if (objObstacle != null) {
targetMenu = new MenuEntry("", "", objObstacle.getId(), MenuOpcode.GAME_OBJECT_FIRST_OPTION.getId(), objObstacle.getSceneMinLocation().getX(), objObstacle.getSceneMinLocation().getY(), false);
utils.setMenuEntry(targetMenu);
utils.delayMouseClick(objObstacle.getConvexHull().getBounds(), sleepDelay());
Rectangle clickPoint = (objObstacle.getConvexHull() != null) ? objObstacle.getConvexHull().getBounds() :
new Rectangle(client.getCenterX() - 50, client.getCenterY() - 50, 100, 100);
utils.delayMouseClick(clickPoint, sleepDelay());
return;
}
} else {