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

Allow displaynames larger than 16 characters

Browse Source
This commit is contained in:
LinsaFTW 2022-06-07 20:38:15 -03:00
parent d9e53cff55
commit 144994155a
5 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 00d921eca130b83c9460fcb3947ce4414803e907 Mon Sep 17 00:00:00 2001
From 7afd78ade68587c487a3922481a89f8832819aa0 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 30 Sep 2021 19:54:33 -0300
Subject: [PATCH] 1.7.x support
@ -46,7 +46,7 @@ index 55c6ee72..56684de7 100644
+ // FlameCord end - 1.7.x support
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 4a07e5be..56f01363 100644
index 014383b3..f8d4721e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -62,7 +62,7 @@ public enum Protocol
@ -915,7 +915,7 @@ index a5555f6a..09dc67f9 100644
buf.writeByte( mode );
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
index 04af585e..66a8e82b 100644
index 12a4d565..cd34f29f 100644
--- a/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
@ -1053,18 +1053,19 @@ index ba7fc59c..d672c8ef 100644
throw CancelSendSignal.INSTANCE;
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index b7d363b8..0d0f4376 100644
index b7d363b8..f4f67b35 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -194,6 +194,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -194,6 +194,8 @@ public final class UserConnection implements ProxiedPlayer
public void setDisplayName(String name)
{
Preconditions.checkNotNull( name, "displayName" );
+ Preconditions.checkArgument( name.length() <= 16, "Display name cannot be longer than 16 characters" ); // FlameCord - 1.7.x support
+ // Its "spigot" responsability to choose wether to support 1.7 or not.
+ //Preconditions.checkArgument( name.length() <= 16, "Display name cannot be longer than 16 characters" ); // FlameCord - 1.7.x support
displayName = name;
}
@@ -518,7 +519,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -518,7 +520,7 @@ public final class UserConnection implements ProxiedPlayer
// transform score components
message = ChatComponentTransformer.getInstance().transform( this, true, message );
@ -1073,7 +1074,7 @@ index b7d363b8..0d0f4376 100644
{
// Versions older than 1.11 cannot send the Action bar with the new JSON formattings
// Fix by converting to a legacy message, see https://bugs.mojang.com/browse/MC-119145
@@ -714,6 +715,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -714,6 +716,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void setTabHeader(BaseComponent header, BaseComponent footer)
{
@ -1081,7 +1082,7 @@ index b7d363b8..0d0f4376 100644
header = ChatComponentTransformer.getInstance().transform( this, true, header )[0];
footer = ChatComponentTransformer.getInstance().transform( this, true, footer )[0];
@@ -726,6 +728,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -726,6 +729,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void setTabHeader(BaseComponent[] header, BaseComponent[] footer)
{
@ -1089,7 +1090,7 @@ index b7d363b8..0d0f4376 100644
header = ChatComponentTransformer.getInstance().transform( this, true, header );
footer = ChatComponentTransformer.getInstance().transform( this, true, footer );
@@ -755,6 +758,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -755,6 +759,7 @@ public final class UserConnection implements ProxiedPlayer
public void setCompressionThreshold(int compressionThreshold)
{
@ -1167,7 +1168,7 @@ index 97c4b210..6082d40c 100644
con.unsafe().sendPacket( pluginMessage );
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
index c973ca63..134c8a1d 100644
index ed1fe41a..7ddda6c3 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -3,6 +3,9 @@ package net.md_5.bungee.connection;
@ -1620,5 +1621,5 @@ index daf12f74..7d053485 100644
@Override
--
2.36.1.windows.1
2.34.1

8
Waterfall-Proxy-Patches/0015-Change-IllegalStateException-to-QuietException-and-e.patch
View File

@ -1,4 +1,4 @@
From 7b7896c320e69ce36355bd3c1b5e8c46465f25d9 Mon Sep 17 00:00:00 2001
From 6545a44d71d2e9d6f08bf4f93306c12c34673b7a Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:40:55 +0800
Subject: [PATCH] Change IllegalStateException to QuietException and explain
@ -6,10 +6,10 @@ Subject: [PATCH] Change IllegalStateException to QuietException and explain
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 0d0f4376..e183e1a1 100644
index f4f67b35..5293552d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -312,7 +312,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -313,7 +313,8 @@ public final class UserConnection implements ProxiedPlayer
if ( getServer() == null && !ch.isClosing() )
{
@ -20,5 +20,5 @@ index 0d0f4376..e183e1a1 100644
return;
}
--
2.36.1.windows.1
2.34.1

12
Waterfall-Proxy-Patches/0017-FlameCord-General-Patch.patch
View File

@ -1,4 +1,4 @@
From fbb4acd9564930b3d9eec1617ab17c829106005a Mon Sep 17 00:00:00 2001
From 36c2b4b28806f491a6fa680be25afe6ba03179f1 Mon Sep 17 00:00:00 2001
From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
Date: Mon, 12 Oct 2020 15:40:53 -0300
Subject: [PATCH] FlameCord General Patch
@ -205,7 +205,7 @@ index 00000000..91d60bfb
+ }
+}
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 66a8e82b..8de74e78 100644
index cd34f29f..824dfca8 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -9,6 +9,8 @@ import com.google.common.collect.Sets;
@ -285,7 +285,7 @@ index 9067b806..cb98a8ea 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index e183e1a1..849ec128 100644
index 5293552d..89b4122c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -35,6 +35,7 @@ import net.md_5.bungee.api.SkinConfiguration;
@ -304,7 +304,7 @@ index e183e1a1..849ec128 100644
@RequiredArgsConstructor
public final class UserConnection implements ProxiedPlayer
@@ -392,9 +394,11 @@ public final class UserConnection implements ProxiedPlayer
@@ -393,9 +395,11 @@ public final class UserConnection implements ProxiedPlayer
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, request.getConnectTimeout() )
.remoteAddress( target.getAddress() );
// Windows is bugged, multi homed users will just have to live with random connecting IPs
@ -319,7 +319,7 @@ index e183e1a1..849ec128 100644
b.connect().addListener( listener );
}
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 fb9a8a19..c6d552e7 100644
index 72328eed..0957c1f1 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -20,6 +20,8 @@ import java.util.logging.Level;
@ -379,5 +379,5 @@ index a95193ba..a4c3bd71 100644
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.Channel;
--
2.36.1.windows.1
2.34.1

10
Waterfall-Proxy-Patches/0022-FlameCord-logger-options.patch
View File

@ -1,4 +1,4 @@
From 409d6c896abd462511e28f1932a124d9966de6e1 Mon Sep 17 00:00:00 2001
From 8e2ea1839113e4c4c7775e6e8cf82fc51b443f4f Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 30 Apr 2021 23:51:51 -0300
Subject: [PATCH] FlameCord logger options
@ -40,7 +40,7 @@ index c8148e90..c327841a 100644
} catch (final IOException e) {
e.printStackTrace();
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 849ec128..dd7c8532 100644
index 89b4122c..999c32f6 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@ -51,7 +51,7 @@ index 849ec128..dd7c8532 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -405,7 +406,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -406,7 +407,10 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{
@ -64,7 +64,7 @@ index 849ec128..dd7c8532 100644
}
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 c6d552e7..477ca39a 100644
index 0957c1f1..7209ac64 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -372,7 +372,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -139,5 +139,5 @@ index c8748ce5..778deb63 100644
{
if ( cause instanceof ReadTimeoutException )
--
2.36.1.windows.1
2.34.1

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

@ -1,4 +1,4 @@
From c8a6949b1219f4c384d49f6db28a1b522ed4017c Mon Sep 17 00:00:00 2001
From b4d62f8bb20ed8b13f50c7993786dfe086c0311c Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 10 Mar 2022 20:23:55 -0300
Subject: [PATCH] Disable entity Metadata Rewrite
@ -49,7 +49,7 @@ index 558d0dbb..35236382 100644
- // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 56f01363..7b9303fc 100644
index f8d4721e..ca918057 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -20,8 +20,6 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@ -324,7 +324,7 @@ index cb98a8ea..c0b42ee2 100644
// Waterfall end
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index dd7c8532..3950ce42 100644
index 999c32f6..f2c60db6 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -44,7 +44,6 @@ import net.md_5.bungee.api.event.ServerConnectEvent;
@ -353,7 +353,7 @@ index dd7c8532..3950ce42 100644
this.displayName = name;
tabListHandler = new ServerUnique( this );
@@ -787,10 +782,4 @@ public final class UserConnection implements ProxiedPlayer
@@ -788,10 +783,4 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}
@ -3233,5 +3233,5 @@ index caed4384..af428090 100644
}
--
2.36.1.windows.1
2.34.1