Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-15 23:06:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix team handing inversion

Browse Source
This commit is contained in:
Shane Freeder 2018-07-21 19:55:47 +01:00
parent b7a2ebe8f5
commit b354bf04ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BungeeCord-Patches/0048-1.13-protocol-support.patch
View File

@ -1,4 +1,4 @@
From c2a02e4a3c6b76b529f4de6bdf8a381892579ef2 Mon Sep 17 00:00:00 2001 From d92c7b5c3f6050b061fe55dcc82eb7e048bea38e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 21 Jul 2018 17:14:39 +0100 Date: Sat, 21 Jul 2018 17:14:39 +0100
Subject: [PATCH] 1.13 protocol support Subject: [PATCH] 1.13 protocol support
@ -114,7 +114,7 @@ index 6279d9f3..edcc59a1 100644
} }
} }
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
index f93508d9..6688b287 100644 index f93508d9..bb4f699b 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@ -131,7 +131,7 @@ index f93508d9..6688b287 100644
{ {
- displayName = readString( buf ); - displayName = readString( buf );
+ // Waterfall start - 1.13 + // Waterfall start - 1.13
+ if (protocolVersion <= ProtocolConstants.MINECRAFT_1_13) { + if (protocolVersion >= ProtocolConstants.MINECRAFT_1_13) {
+ String displayNameJson = readString(buf); + String displayNameJson = readString(buf);
+ displayName = TextComponent.toLegacyText(ComponentSerializer.parse(displayNameJson)); + displayName = TextComponent.toLegacyText(ComponentSerializer.parse(displayNameJson));
+ } else { + } else {
@ -162,7 +162,7 @@ index f93508d9..6688b287 100644
{ {
- writeString( displayName, buf ); - writeString( displayName, buf );
+ // Waterfall start - 1.13 + // Waterfall start - 1.13
+ if (protocolVersion <= ProtocolConstants.MINECRAFT_1_13) { + if (protocolVersion >= ProtocolConstants.MINECRAFT_1_13) {
+ String displayNameJson = ComponentSerializer.toString(TextComponent.fromLegacyText(displayName)); + String displayNameJson = ComponentSerializer.toString(TextComponent.fromLegacyText(displayName));
+ writeString( displayNameJson, buf ); + writeString( displayNameJson, buf );
+ } else { + } else {