mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-19 00:35:55 +01:00
2554ec2219
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by 2LStudios and as with ANY update, please do your own testing Waterfall Changes:59dbd08
Updated Upstream (BungeeCord) (#747)9719e25
Temp disable protocol limits for 1.199b0080a
Fix crash on startup (#743)958ae29
Updated Upstream (BungeeCord) (#741)29f1cfb
Improve login state transitiona44c78a
Various library bumps
47 lines
2.6 KiB
Diff
47 lines
2.6 KiB
Diff
From f1ef24bf5679ec5b5f06df202a1f3952a8f2f65e Mon Sep 17 00:00:00 2001
|
|
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
|
Date: Fri, 4 Mar 2022 14:09:35 -0300
|
|
Subject: [PATCH] Allow Invalid Names
|
|
|
|
|
|
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
|
index da3f915f..31631626 100644
|
|
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
|
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
|
@@ -16,6 +16,10 @@ import net.md_5.bungee.config.Configuration;
|
|
import net.md_5.bungee.config.ConfigurationProvider;
|
|
|
|
public class FlameCordConfiguration extends FlameConfig {
|
|
+ // FlameCord - Allow Invalid Names
|
|
+ @Getter
|
|
+ private boolean allowInvalidNames = false;
|
|
+
|
|
// FlameCord start - Antibot System
|
|
@Getter
|
|
private boolean antibotAccountsEnabled = true;
|
|
@@ -231,6 +235,8 @@ public class FlameCordConfiguration extends FlameConfig {
|
|
this.fakePlayersEnabled = setIfUnexistant("custom-motd.fakeplayers.enabled", this.fakePlayersEnabled, configuration);
|
|
this.fakePlayersAmount = setIfUnexistant("custom-motd.fakeplayers.amount", this.fakePlayersAmount, configuration);
|
|
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
|
+ this.allowInvalidNames = setIfUnexistant("allow-invalid-names", this.allowInvalidNames, configuration);
|
|
+
|
|
loadAntibot(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
|
|
index 716949ae..7c539248 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
|
|
@@ -500,7 +500,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
Preconditions.checkState( thisState == State.USERNAME, "Not expecting USERNAME" );
|
|
thisState = State.PROCESSING_USERNAME;
|
|
|
|
- if ( !AllowedCharacters.isValidName( loginRequest.getData(), onlineMode ) )
|
|
+ if ( !FlameCord.getInstance().getFlameCordConfiguration().isAllowInvalidNames() && !AllowedCharacters.isValidName( loginRequest.getData(), onlineMode ) )
|
|
{
|
|
disconnect( bungee.getTranslation( "name_invalid" ) );
|
|
return;
|
|
--
|
|
2.36.1.windows.1
|
|
|