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

Fix Merge Issues

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

19
Waterfall-Proxy-Patches/0029-Antibot-System.patch
View File

@ -1,4 +1,4 @@
From 63d3913f6a959a1f6342ce20e5a60c30e6025f16 Mon Sep 17 00:00:00 2001 From 10f4ef5fac597b0e430170642fff1ab709930421 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com> From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 4 Mar 2022 13:35:53 -0300 Date: Fri, 4 Mar 2022 13:35:53 -0300
Subject: [PATCH] Antibot System Subject: [PATCH] Antibot System
@ -675,7 +675,7 @@ index a32522fe..9b628ad5 100644
setIfUnexistant("flamecord_reload", "&aAll files had been successfully reloaded!", configuration); setIfUnexistant("flamecord_reload", "&aAll files had been successfully reloaded!", configuration);
setIfUnexistant("flamecord_help", setIfUnexistant("flamecord_help",
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 4d9e9b89..56793ae7 100644 index 4ced9bd6..714a903d 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
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -19,6 +19,8 @@ import java.util.logging.Level; @@ -19,6 +19,8 @@ import java.util.logging.Level;
@ -687,16 +687,19 @@ index 4d9e9b89..56793ae7 100644
import dev._2lstudios.flamecord.FlameCord; import dev._2lstudios.flamecord.FlameCord;
import lombok.Getter; import lombok.Getter;
@@ -133,7 +135,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -133,7 +135,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private boolean canSendKickMessage() private boolean canSendKickMessage()
{ {
- return thisState == State.USERNAME || thisState == State.ENCRYPT || thisState == State.FINISHING; +<<<<<<< HEAD
return thisState == State.PROCESSING_USERNAME || thisState == State.USERNAME || thisState == State.ENCRYPT || thisState == State.FINISHING;
+=======
+ return thisState == State.USERNAME || thisState == State.PROCESSING_USERNAME || thisState == State.ENCRYPT || thisState == State.FINISHING; + return thisState == State.USERNAME || thisState == State.PROCESSING_USERNAME || thisState == State.ENCRYPT || thisState == State.FINISHING;
+>>>>>>> Antibot System
} }
@Override @Override
@@ -371,6 +373,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -371,6 +377,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
return; return;
} }
@ -708,7 +711,7 @@ index 4d9e9b89..56793ae7 100644
switch ( handshake.getRequestedProtocol() ) switch ( handshake.getRequestedProtocol() )
{ {
case 1: case 1:
@@ -382,6 +389,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -382,6 +393,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
} }
thisState = State.STATUS; thisState = State.STATUS;
ch.setProtocol( Protocol.STATUS ); ch.setProtocol( Protocol.STATUS );
@ -726,7 +729,7 @@ index 4d9e9b89..56793ae7 100644
break; break;
case 2: case 2:
// Login // Login
@@ -393,6 +411,16 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -393,6 +415,16 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.USERNAME; thisState = State.USERNAME;
ch.setProtocol( Protocol.LOGIN ); ch.setProtocol( Protocol.LOGIN );
@ -743,7 +746,7 @@ index 4d9e9b89..56793ae7 100644
if ( !ProtocolConstants.SUPPORTED_VERSION_IDS.contains( handshake.getProtocolVersion() ) ) if ( !ProtocolConstants.SUPPORTED_VERSION_IDS.contains( handshake.getProtocolVersion() ) )
{ {
if ( handshake.getProtocolVersion() > bungee.getProtocolVersion() ) if ( handshake.getProtocolVersion() > bungee.getProtocolVersion() )
@@ -430,6 +458,31 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -430,6 +462,31 @@ public class InitialHandler extends PacketHandler implements PendingConnection
return; return;
} }

6
Waterfall-Proxy-Patches/0030-Allow-Invalid-Names.patch
View File

@ -1,4 +1,4 @@
From 1b786bef7bb3a52c0f246b82e930290f518fc8db Mon Sep 17 00:00:00 2001 From cbe27677eeb2b1d2821160e46b8073ed37023725 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com> From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 4 Mar 2022 14:09:35 -0300 Date: Fri, 4 Mar 2022 14:09:35 -0300
Subject: [PATCH] Allow Invalid Names Subject: [PATCH] Allow Invalid Names
@ -29,10 +29,10 @@ index 1a445ec8..25cfc0bd 100644
this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration); this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
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 56793ae7..49bb7ade 100644 index 714a903d..066ef4b9 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
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -444,7 +444,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -448,7 +448,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( thisState == State.USERNAME, "Not expecting USERNAME" ); Preconditions.checkState( thisState == State.USERNAME, "Not expecting USERNAME" );
thisState = State.PROCESSING_USERNAME; thisState = State.PROCESSING_USERNAME;