From 62c0af064d308f54d0b6f6c9c0eed13dd4ca2507 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 29 Apr 2022 14:16:02 -0400 Subject: [PATCH] crowdsourcing: don't include menuoptionclicked event in movementdata Serializing the event no longer works as expected, but is also not a good idea in general --- .../crowdsourcing/movement/CrowdsourcingMovement.java | 4 +++- .../plugins/crowdsourcing/movement/MovementData.java | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java index 7f21c2fda2..ecad37dc91 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java @@ -69,7 +69,9 @@ public class CrowdsourcingMovement int distance = nextPoint.distanceTo(lastPoint); if (distance > 2 || nextIsInInstance != lastIsInInstance) { - MovementData data = new MovementData(lastPoint, nextPoint, lastIsInInstance, nextIsInInstance, ticksStill, lastClick); + MovementData data = new MovementData(lastPoint, nextPoint, lastIsInInstance, nextIsInInstance, + ticksStill, lastClick.getMenuAction(), lastClick.getId(), lastClick.getMenuOption(), + lastClick.getMenuTarget(), lastClick.getParam0(), lastClick.getParam1()); manager.storeEvent(data); } if (distance > 0) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java index 1b9c6aef9e..0ffbb9e477 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java @@ -27,8 +27,8 @@ package net.runelite.client.plugins.crowdsourcing.movement; import lombok.AllArgsConstructor; import lombok.Data; +import net.runelite.api.MenuAction; import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.MenuOptionClicked; @Data @AllArgsConstructor @@ -39,5 +39,10 @@ public class MovementData private final boolean fromInstance; private final boolean toInstance; private final int ticks; - private MenuOptionClicked lastClick; + private MenuAction menuAction; + private int menuIdentifier; + private String menuOption; + private String menuTarget; + private int param0; + private int param1; }