Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-30 07:27:28 +02:00
Code Issues Projects Releases Wiki Activity

Dont send empty messages

Browse Source
This commit is contained in:
LinsaFTW 2023-03-24 19:33:18 -03:00
parent 0776397359
commit 8d413a58d6
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Waterfall-Proxy-Patches/0020-FlameCord-message-configuration.patch
View File

@ -1,11 +1,11 @@
From 168e63822c7f19251ff48a96fb341b230d662143 Mon Sep 17 00:00:00 2001
From 1bcd1ea1d1480107e8e63b28761d3be67ab4467b Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Sat, 1 May 2021 13:40:39 -0300
Subject: [PATCH] FlameCord message configuration
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java
index fb3d8ca2e..676ba95b9 100644
index fb3d8ca2..676ba95b 100644
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java
@@ -4,6 +4,7 @@ import java.util.Collection;
@ -35,7 +35,7 @@ index fb3d8ca2e..676ba95b9 100644
\ No newline at end of file
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
new file mode 100644
index 000000000..ae1794385
index 00000000..ae179438
--- /dev/null
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
@@ -0,0 +1,102 @@
@ -143,7 +143,7 @@ index 000000000..ae1794385
+}
\ No newline at end of file
diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
index 698b420f4..e4ad7e389 100644
index 698b420f..e4ad7e38 100644
--- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
+++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
@@ -50,7 +50,9 @@ public class CommandServer extends Command implements TabExecutor
@ -158,7 +158,7 @@ index 698b420f4..e4ad7e389 100644
serverTextComponent.setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, "/server " + server.getName() ) );
serverList.append( serverTextComponent );
diff --git a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java
index 021b38d43..fb81adee0 100644
index 021b38d4..fb81adee 100644
--- a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java
+++ b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java
@@ -4,6 +4,7 @@ import java.util.Collection;
@ -205,7 +205,7 @@ index 021b38d43..fb81adee0 100644
}
}
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 d58227fd9..8994454c7 100644
index 7c4da8c4..0c53eba3 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -620,8 +620,8 @@ public class BungeeCord extends ProxyServer
@ -219,6 +219,18 @@ index d58227fd9..8994454c7 100644
}
@Override
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 e48f7713..0c4a0def 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -461,6 +461,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void sendMessage(String message)
{
+ if (!message.equals("")) // FlameCord - FlameCord message configuration
sendMessage( TextComponent.fromLegacyText( message ) );
}
--
2.37.3.windows.1

6
Waterfall-Proxy-Patches/0030-Disable-entity-Metadata-Rewrite.patch
View File

@ -1,4 +1,4 @@
From 828bb1d13c25fc9e7184bed56790e58a021f2222 Mon Sep 17 00:00:00 2001
From 54416b5037fd35a10bf3763fa55a9cfd4f8da531 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
@ -324,7 +324,7 @@ index 3a07c7c8..f51c668d 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 90922797..f3d60253 100644
index b5e20ea1..18a29ae3 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 90922797..f3d60253 100644
this.displayName = name;
tabListHandler = new ServerUnique( this );
@@ -794,10 +789,4 @@ public final class UserConnection implements ProxiedPlayer
@@ -795,10 +790,4 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}