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

Merge pull request #7714 from deathbeam/user-sync-cleanup

Browse Source 
Make party UserSync event extend PartyMemberMessage
This commit is contained in:
Tomas Slusny
2019-02-06 07:26:31 +00:00
committed by GitHub
parent 09a7dd7579 18610d6804
commit 7beee692a2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http-api/src/main/java/net/runelite/http/api/ws/messages/party/UserSync.java
View File

@@ -24,11 +24,9 @@
*/ */
package net.runelite.http.api.ws.messages.party; package net.runelite.http.api.ws.messages.party;
import java.util.UUID;
import lombok.Value; import lombok.Value;
@Value @Value
public class UserSync extends PartyMessage public class UserSync extends PartyMemberMessage
{ {
private final UUID memberId;
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
View File

@@ -283,7 +283,9 @@ public class PartyPlugin extends Plugin implements KeyListener
if (doSync && !party.getMembers().isEmpty()) if (doSync && !party.getMembers().isEmpty())
{ {
// Request sync // Request sync
ws.send(new UserSync(party.getLocalMember().getMemberId())); final UserSync userSync = new UserSync();
userSync.setMemberId(party.getLocalMember().getMemberId());
ws.send(userSync);
} }
doSync = false; doSync = false;

4
runelite-client/src/main/java/net/runelite/client/ws/PartyService.java
View File

@@ -123,7 +123,9 @@ public class PartyService
// Send info to other clients that this user successfully finished joining party // Send info to other clients that this user successfully finished joining party
if (localMember != null && message.getMemberId().equals(localMember.getMemberId())) 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);
} }
} }