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

Fix brand not displayed (#120)

Browse Source
This commit is contained in:
Luccboy 2022-04-30 12:54:50 +02:00
parent 2af084aaec
commit c3fd987ec6
No known key found for this signature in database
GPG Key ID: 76BE98798CD9E112
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Waterfall-Proxy-Patches/0004-1.7.x-support.patch
View File

@ -1,4 +1,4 @@
From 2c965a41d72b044e78b263ce969bfd91a14062ba Mon Sep 17 00:00:00 2001 From 8369e2e37828ebdb3448b61a3a484dcf25e813a7 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com> From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 30 Sep 2021 19:54:33 -0300 Date: Thu, 30 Sep 2021 19:54:33 -0300
Subject: [PATCH] 1.7.x support Subject: [PATCH] 1.7.x support
@ -1021,7 +1021,7 @@ index a5555f6a..09dc67f9 100644
buf.writeByte( mode ); buf.writeByte( mode );
if ( mode == 0 || mode == 2 ) if ( mode == 0 || mode == 2 )
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 15a639de..0b02ae7d 100644 index 11b62d81..5ef34fcb 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -170,6 +170,14 @@ public class BungeeCord extends ProxyServer @@ -170,6 +170,14 @@ public class BungeeCord extends ProxyServer
@ -1982,7 +1982,7 @@ index 00000000..7c52ee9a
+ // Waterfall end + // Waterfall end
+} +}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 97c4b210..a0b03ec1 100644 index 97c4b210..6082d40c 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -18,6 +18,7 @@ import io.netty.buffer.Unpooled; @@ -18,6 +18,7 @@ import io.netty.buffer.Unpooled;
@ -2011,7 +2011,7 @@ index 97c4b210..a0b03ec1 100644
} }
break; break;
default: default:
@@ -292,19 +293,28 @@ public class DownstreamBridge extends PacketHandler @@ -292,16 +293,28 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) ) if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) )
{ {
@ -2025,9 +2025,6 @@ index 97c4b210..a0b03ec1 100644
- DefinedPacket.writeString( bungee.getName() + " <- " + serverBrand, brand ); // Waterfall - DefinedPacket.writeString( bungee.getName() + " <- " + serverBrand, brand ); // Waterfall
- pluginMessage.setData( brand ); - pluginMessage.setData( brand );
- brand.release(); - brand.release();
- // changes in the packet are ignored so we need to send it manually
- con.unsafe().sendPacket( pluginMessage );
- throw CancelSendSignal.INSTANCE;
+ // FlameCord start - 1.7.x support + // FlameCord start - 1.7.x support
+ if ( ProtocolConstants.isAfterOrEq( con.getPendingConnection().getVersion(), ProtocolConstants.MINECRAFT_1_8 ) ) + if ( ProtocolConstants.isAfterOrEq( con.getPendingConnection().getVersion(), ProtocolConstants.MINECRAFT_1_8 ) )
+ { + {
@ -2050,9 +2047,9 @@ index 97c4b210..a0b03ec1 100644
+ pluginMessage.setData( ( bungee.getName() + " <- " + serverBrand ).getBytes(StandardCharsets.UTF_8) ); // FlameCord - 1.7.x support + pluginMessage.setData( ( bungee.getName() + " <- " + serverBrand ).getBytes(StandardCharsets.UTF_8) ); // FlameCord - 1.7.x support
+ } + }
+ // FlameCord end - 1.7.x support + // FlameCord end - 1.7.x support
} // changes in the packet are ignored so we need to send it manually
con.unsafe().sendPacket( pluginMessage );
if ( pluginMessage.getTag().equals( "BungeeCord" ) ) throw CancelSendSignal.INSTANCE;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 4afab05d..f6378e03 100644 index 4afab05d..f6378e03 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@ -2507,5 +2504,5 @@ index daf12f74..7d053485 100644
@Override @Override
-- --
2.32.0 2.36.0.windows.1

8
Waterfall-Proxy-Patches/0032-Disable-entity-Metadata-Rewrite.patch
View File

@ -1,4 +1,4 @@
From bad778afeee50f6043077174f44ee97afcc8bd5b Mon Sep 17 00:00:00 2001 From 27d447c5af7941b6a84a2fed75d742a434a128f3 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com> From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 10 Mar 2022 20:23:55 -0300 Date: Thu, 10 Mar 2022 20:23:55 -0300
Subject: [PATCH] Disable entity Metadata Rewrite Subject: [PATCH] Disable entity Metadata Rewrite
@ -365,7 +365,7 @@ index 849b4774..6131d7ea 100644
- // Waterfall end - // Waterfall end
} }
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index a0b03ec1..20adce50 100644 index 6082d40c..194ada04 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -46,7 +46,6 @@ import net.md_5.bungee.api.score.Score; @@ -46,7 +46,6 @@ import net.md_5.bungee.api.score.Score;
@ -397,7 +397,7 @@ index a0b03ec1..20adce50 100644
con.sendPacket( packet ); con.sendPacket( packet );
} }
@@ -685,34 +677,6 @@ public class DownstreamBridge extends PacketHandler @@ -688,34 +680,6 @@ public class DownstreamBridge extends PacketHandler
} }
} }
@ -3230,5 +3230,5 @@ index caed4384..af428090 100644
} }
-- --
2.32.0 2.36.0.windows.1