From 18610d680401be630ef980f47da17343269a5347 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 5 Feb 2019 12:10:17 +0000 Subject: [PATCH] Make party UserSync event extend PartyMemberMessage Signed-off-by: Tomas Slusny --- .../net/runelite/http/api/ws/messages/party/UserSync.java | 4 +--- .../java/net/runelite/client/plugins/party/PartyPlugin.java | 4 +++- .../src/main/java/net/runelite/client/ws/PartyService.java | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java b/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java index da72fda01f..eca9844845 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java @@ -24,11 +24,9 @@ */ package net.runelite.http.api.ws.messages.party; -import java.util.UUID; import lombok.Value; @Value -public class UserSync extends PartyMessage +public class UserSync extends PartyMemberMessage { - private final UUID memberId; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 91637e317a..109c817f39 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -283,7 +283,9 @@ public class PartyPlugin extends Plugin implements KeyListener if (doSync && !party.getMembers().isEmpty()) { // Request sync - ws.send(new UserSync(party.getLocalMember().getMemberId())); + final UserSync userSync = new UserSync(); + userSync.setMemberId(party.getLocalMember().getMemberId()); + ws.send(userSync); } doSync = false; diff --git a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java index 279be1a37c..7debf6eaf2 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java @@ -123,7 +123,9 @@ public class PartyService // Send info to other clients that this user successfully finished joining party if (localMember != null && message.getMemberId().equals(localMember.getMemberId())) { - wsClient.send(new UserSync(message.getMemberId())); + final UserSync userSync = new UserSync(); + userSync.setMemberId(message.getMemberId()); + wsClient.send(userSync); } }