Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2021-03-02 08:48:46 -04:00
commit 34bfe32e39
11 files changed
+94 -21

No files matched your search

+8
View File
@@ -536,6 +536,14 @@ public class CarpetSettings
)
public static int maxEntityCollisions = 0;
@Rule(
desc = "Customizable server list ping (Multiplayer menu) playerlist sample limit",
options = {"0", "12", "20", "40"},
category = CREATIVE,
strict = false,
validate = Validator.NONNEGATIVE_NUMBER.class
)
public static int pingPlayerListLimit = 12;
/*
@Rule(