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

Merge branch 'master' of https://github.com/2lstudios-mc/FlameCord

Browse Source
This commit is contained in:
LinsaFTW 2022-03-04 14:11:36 -03:00
commit c707d17046
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall-Proxy-Patches/0003-FlameCord-rebrand.patch
View File

@ -27,7 +27,7 @@ index a4b58d9c..8b655261 100644
public String getVersion()
{
- return ( BungeeCord.class.getPackage().getImplementationVersion() == null ) ? "unknown" : BungeeCord.class.getPackage().getImplementationVersion();
+ return "0.7.2";
+ return "0.7.4";
}
public void reloadMessages()

8
Waterfall-Proxy-Patches/0028-InitialHandler-Processing-State.patch
View File

@ -8,7 +8,7 @@ diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 0c608e0f..4d9e9b89 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
@@ -128,7 +128,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -128,12 +128,12 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private enum State
{
@ -17,6 +17,12 @@ index 0c608e0f..4d9e9b89 100644
}
private boolean canSendKickMessage()
{
- return thisState == State.USERNAME || thisState == State.ENCRYPT || thisState == State.FINISHING;
+ return thisState == State.PROCESSING_USERNAME || thisState == State.USERNAME || thisState == State.ENCRYPT || thisState == State.FINISHING;
}
@Override
@@ -248,6 +248,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void handle(StatusRequest statusRequest) throws Exception
{