Merge 2f6bc0e090 into 6fc31bebf3

.gitignore

@@ -2,6 +2,7 @@ cache/
 /libraries/
 /logs/
 /plugins/.paper-remapped/
+/plugins/CommandSpy/state.bin
 /plugins/Essentials/userdata
 /plugins/Essentials/warps/*
 /plugins/Essentials/custom_items.yml

config/paper-global.yml

@@ -49,6 +49,7 @@ collisions:
   enable-player-collisions: true
   send-full-pos-for-hard-colliding-entities: true
 commands:
+  ride-command-allow-player-as-vehicle: true
   suggest-player-names-when-null-tab-completions: true
   time-command-affects-all-worlds: false
 console:
@@ -86,7 +87,7 @@ misc:
   fix-entity-position-desync: true
   lag-compensate-block-breaking: true
   load-permissions-yml-before-plugins: true
-  max-joins-per-tick: 3
+  max-joins-per-tick: 5
   region-file-cache-size: 256
   strict-advancement-dimension-check: false
   use-alternative-luck-formula: false
@@ -140,7 +141,10 @@ unsupported-settings:
   allow-unsafe-end-portal-teleportation: false
   compression-format: ZLIB
   perform-username-validation: false
+  simplify-remote-item-matching: false
+  skip-tripwire-hook-placement-validation: false
   skip-vanilla-damage-tick-when-shield-blocked: false
+  update-equipment-on-player-actions: true
 watchdog:
   early-warning-delay: 10000
   early-warning-every: 5000

config/paper-world-defaults.yml

@@ -82,6 +82,7 @@ entities:
   behavior:
     allow-spider-world-border-climbing: true
     baby-zombie-movement-modifier: 0.5
+    cooldown-failed-beehive-releases: true
     disable-chest-cat-detection: true
     disable-creeper-lingering-effect: false
     disable-player-crits: false
@@ -294,7 +295,6 @@ misc:
   disable-relative-projectile-velocity: false
   disable-sprint-interruption-on-attack: false
   legacy-ender-pearl-behavior: false
-  light-queue-size: 20
   max-leash-distance: 10.0
   redstone-implementation: ALTERNATE_CURRENT
   shield-blocking-delay: 5

permissions.yml

@@ -28,6 +28,11 @@ op:
       geyser.command.reload: false
       geyser.command.stop: false
 
+      # Essentials requires this permission to be explicitly granted
+      # to players
+
+      essentials.nick.allowunsafe: true
+
       # Due to WorldEdit permission shenanigans, we have to grant
       # permissions manually to enforce block edit limits
 

plugins/Essentials/config.yml

@@ -5,7 +5,7 @@
 ############################################################
 
 # This is the config file for EssentialsX.
-# This config was generated for version 2.21.0-dev+151-f2af952.
+# This config was generated for version 2.21.1-dev+4-50b696b.
 
 # If you want to use special characters in this document, such as accented letters, you MUST save the file as UTF-8, not ANSI.
 # If you receive an error when Essentials loads, ensure that:
@@ -31,7 +31,12 @@ ops-name-color: 'c'
 nickname-prefix: ''
 
 # The maximum length allowed in nicknames. The nickname prefix is not included in this.
-max-nick-length: 99999
+max-nick-length: 64
+
+# The regex pattern used to determine if a requested nickname should be allowed for use.
+# If the a requested nickname does not matched this pattern, the nickname will be rejected.
+# Users with essentials.nick.allowunsafe will be able to bypass this check.
+allowed-nicks-regex: ''
 
 # A list of phrases that cannot be used in nicknames. You can include regular expressions here.
 # Users with essentials.nick.blacklist.bypass will be able to bypass this filter.
@@ -224,6 +229,11 @@ socialspy-uses-displaynames: false
 # This will disable flight if the player does not have essentials.fly.
 world-change-fly-reset: true
 
+# Starting in 1.17, Minecraft no longer preserves the abilities of a player when they change worlds.
+# Setting this to true will make EssentialsX preserve if users flying when they change worlds.
+# This will only work if the player has the essentials.fly permission.
+world-change-preserve-flying: true
+
 # When a player changes world, should we reset their speed according to their permissions?
 # This resets the player's speed to the default if they don't have essentials.speed.
 # If the player doesn't have essentials.speed.bypass, this resets their speed to the maximum specified above.

plugins/ViaVersion/config.yml

@@ -2,7 +2,7 @@
 # Ensure you look through all these options
 # If you need help:
 # Discord - https://viaversion.com/discord
-# Docs - https://docs.viaversion.com/display/VIAVERSION/Configuration
+# Docs - https://docs.viaversion.com
 #
 #----------------------------------------------------------#
 #                     GLOBAL OPTIONS                       #

server.properties

@@ -5,7 +5,7 @@ allow-flight=true
 allow-nether=true
 broadcast-console-to-ops=true
 broadcast-rcon-to-ops=true
-bug-report-link=https\://github.com/kaboomserver/server/issues
+bug-report-link=
 debug=false
 difficulty=easy
 enable-command-block=true

spigot.yml

@@ -15,14 +15,10 @@ commands:
   log: true
   tab-complete: 0
   send-namespaced: true
-  spam-exclusions:
-  - /skill
+  spam-exclusions: []
   silent-commandblock-console: true
-  replace-commands:
-  - setblock
-  - summon
-  - testforblock
-  - tellraw
+  replace-commands: []
+  enable-spam-exclusions: false
 messages:
   whitelist: The server is temporarily down for maintenance. Please try again later!
   unknown-command: Unknown command. Type "/help" for help.