mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-10-02 00:18:07 +02:00
d61b93a1e7
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 75af27ac Fix missing static on ChatColor.values d0fd673b Minecraft 1.16 support + RGB ChatColor preview
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 8b4c91510a061f133ce20defed7ca62869e3cd16 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sat, 20 Jun 2020 18:21:17 +0100
|
|
Subject: [PATCH] Remove version from brand info
|
|
|
|
|
|
diff --git a/log4j/pom.xml b/log4j/pom.xml
|
|
index f5267567..e9d935ef 100644
|
|
--- a/log4j/pom.xml
|
|
+++ b/log4j/pom.xml
|
|
@@ -5,13 +5,13 @@
|
|
<parent>
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
<artifactId>waterfall-parent</artifactId>
|
|
- <version>1.15-SNAPSHOT</version>
|
|
+ <version>1.16-R0.1-SNAPSHOT</version>
|
|
<relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<groupId>io.github.waterfallmc</groupId>
|
|
<artifactId>waterfall-log4j</artifactId>
|
|
- <version>1.15-SNAPSHOT</version>
|
|
+ <version>1.16-R0.1-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
<name>Waterfall-Log</name>
|
|
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 d7d0fafc..daac8604 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
|
@@ -281,7 +281,7 @@ public class DownstreamBridge extends PacketHandler
|
|
Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
|
|
|
|
brand = ByteBufAllocator.DEFAULT.heapBuffer();
|
|
- DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
|
|
+ DefinedPacket.writeString( bungee.getName() + " <- " + serverBrand, brand ); // Waterfall
|
|
pluginMessage.setData( brand );
|
|
brand.release();
|
|
// changes in the packet are ignored so we need to send it manually
|
|
--
|
|
2.27.0
|
|
|