Update hidden-configs
Dieser Commit ist enthalten in:
Ursprung
a55532115f
Commit
269394fe15
@ -1,4 +1,4 @@
|
||||
From 50e4286b71f66dfe05505d9856df25b120928111 Mon Sep 17 00:00:00 2001
|
||||
From 6e93e0626a1b78e77f6f0ab7fe9f31f0fbc75d43 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Steinborn <git@steinborn.me>
|
||||
Date: Mon, 8 Oct 2018 14:36:14 -0400
|
||||
Subject: [PATCH] Add Velocity IP Forwarding Support
|
||||
@ -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 092bff78a..7e85a0224 100644
|
||||
index 092bff78ab..a987916055 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -8,6 +8,7 @@ import java.io.IOException;
|
||||
@ -34,7 +34,7 @@ index 092bff78a..7e85a0224 100644
|
||||
}
|
||||
|
||||
public static int packetInSpamThreshold = 300;
|
||||
@@ -336,4 +337,18 @@ public class PaperConfig {
|
||||
@@ -336,4 +337,19 @@ public class PaperConfig {
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -46,6 +46,7 @@ index 092bff78a..7e85a0224 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 (velocitySupport && secret.isEmpty()) {
|
||||
+ fatal("Velocity support is enabled, but no secret key was specified. A secret key is required!");
|
||||
+ } else {
|
||||
@ -55,7 +56,7 @@ index 092bff78a..7e85a0224 100644
|
||||
}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
|
||||
new file mode 100644
|
||||
index 000000000..fdd8708f9
|
||||
index 0000000000..fdd8708f97
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
|
||||
@@ -0,0 +1,67 @@
|
||||
@ -127,7 +128,7 @@ index 000000000..fdd8708f9
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
|
||||
index 1c4ac7bf7..47cf10501 100644
|
||||
index 1c4ac7bf7a..47cf105019 100644
|
||||
--- a/src/main/java/net/minecraft/server/LoginListener.java
|
||||
+++ b/src/main/java/net/minecraft/server/LoginListener.java
|
||||
@@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
|
||||
@ -203,7 +204,7 @@ index 1c4ac7bf7..47cf10501 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
|
||||
index 08e314af7..046196d54 100644
|
||||
index 08e314af7c..046196d54d 100644
|
||||
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
||||
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
||||
@@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
||||
@ -216,7 +217,7 @@ index 08e314af7..046196d54 100644
|
||||
public java.util.UUID spoofedUUID;
|
||||
public com.mojang.authlib.properties.Property[] spoofedProfile;
|
||||
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||
index 93ae6dcd7..fb9186b3f 100644
|
||||
index 93ae6dcd78..fb9186b3f5 100644
|
||||
--- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||
+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||
@@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
|
||||
@ -244,7 +245,7 @@ index 93ae6dcd7..fb9186b3f 100644
|
||||
int j = this.i();
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
||||
index 4d1f44139..c1ca6f950 100644
|
||||
index 4d1f441395..c1ca6f9501 100644
|
||||
--- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
||||
+++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
||||
@@ -4,8 +4,8 @@ import java.io.IOException;
|
||||
@ -259,7 +260,7 @@ index 4d1f44139..c1ca6f950 100644
|
||||
public PacketLoginInCustomPayload() {}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
||||
index ae74dc9e1..7eb230f1b 100644
|
||||
index ae74dc9e18..7eb230f1b2 100644
|
||||
--- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
||||
+++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
||||
@@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
|
||||
@ -278,7 +279,7 @@ index ae74dc9e1..7eb230f1b 100644
|
||||
public void a(PacketDataSerializer packetdataserializer) throws IOException {
|
||||
this.a = packetdataserializer.i();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 4289d029c..fa35b8459 100644
|
||||
index 4289d029c2..fa35b84597 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -647,7 +647,7 @@ public final class CraftServer implements Server {
|
||||
@ -291,5 +292,5 @@ index 4289d029c..fa35b8459 100644
|
||||
} else {
|
||||
return this.configuration.getInt("settings.connection-throttle");
|
||||
--
|
||||
2.25.1
|
||||
2.26.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0eb27d72c28840e861e1e358a2db21780bdcc3b5 Mon Sep 17 00:00:00 2001
|
||||
From 968b20b483f3384d41dbbe90e279fe32a64c598d Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 16 Nov 2018 23:08:50 -0500
|
||||
Subject: [PATCH] Book Size Limits
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Book Size Limits
|
||||
Puts some limits on the size of books.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 7e85a0224..30f35304a 100644
|
||||
index a987916055..30c794cfbf 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -351,4 +351,11 @@ public class PaperConfig {
|
||||
@@ -352,4 +352,11 @@ public class PaperConfig {
|
||||
velocitySecretKey = secret.getBytes(StandardCharsets.UTF_8);
|
||||
}
|
||||
}
|
||||
@ -22,7 +22,7 @@ index 7e85a0224..30f35304a 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index b21fca9e5..784f0a3f2 100644
|
||||
index b21fca9e5c..784f0a3f22 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -14,6 +14,7 @@ import java.util.Iterator;
|
||||
@ -77,5 +77,5 @@ index b21fca9e5..784f0a3f2 100644
|
||||
// CraftBukkit start
|
||||
if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
|
||||
--
|
||||
2.25.1
|
||||
2.26.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0cf0f921e83dd698df146baff3bc1da04fecb2c1 Mon Sep 17 00:00:00 2001
|
||||
From d20ece1f23e5a10ab447b9b23b433ce5d4989084 Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||
Date: Sat, 13 Jul 2019 09:23:10 -0700
|
||||
Subject: [PATCH] Asynchronous chunk IO and loading
|
||||
@ -161,7 +161,7 @@ index 27ce4a828e..30bafb214b 100644
|
||||
|
||||
public static Timing getTickList(WorldServer worldserver, String timingsType) {
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 546a1cfe0a..1d7d1ffbf7 100644
|
||||
index 8d1e871dd2..93ac863332 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -171,7 +171,7 @@ index 546a1cfe0a..1d7d1ffbf7 100644
|
||||
import com.google.common.base.Strings;
|
||||
import com.google.common.base.Throwables;
|
||||
|
||||
@@ -364,4 +365,64 @@ public class PaperConfig {
|
||||
@@ -365,4 +366,64 @@ public class PaperConfig {
|
||||
maxBookPageSize = getInt("settings.book-size.page-max", maxBookPageSize);
|
||||
maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
|
||||
}
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren