Don't duplicate velocity entry into hidden-configs

also, rebuild patches
This commit is contained in:
Shane Freeder
2020-03-31 05:21:27 +01:00
parent 3fb59b0d47
commit a2407225da
4 changed files with 8 additions and 6 deletions

View File

@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
login plugin message packet.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 092bff78ab..a987916055 100644
index 092bff78ab..421e78d624 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ import java.io.IOException;
@@ -46,7 +46,9 @@ index 092bff78ab..a987916055 100644
+ velocitySupport = getBoolean("settings.velocity-support.enabled", false);
+ velocityOnlineMode = getBoolean("settings.velocity-support.online-mode", false);
+ String secret = getString("settings.velocity-support.secret", "");
+ TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
+ if (TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
+ TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
+ }
+ if (velocitySupport && secret.isEmpty()) {
+ fatal("Velocity support is enabled, but no secret key was specified. A secret key is required!");
+ } else {