39 changed files with 151 additions and 433 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -46,5 +46,3 @@ src/plugins/BlueMap/data/minecraft-client-1.21.jar
 src/plugins/BMMarker/data

 src/plugins/LibertyBans/internal
-
-src/plugins/Chunky/tasks
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@ -5,8 +5,6 @@ on:
    branches:
      - main
      - develop
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'

 jobs:
  build-docker:
@ -44,6 +42,5 @@ jobs:
          push: true
          # TODO: split tag names into multiple lines
          tags: |
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.sha}}
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.ref_name}}
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:latest            
+            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:${{github.sha}}
+            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:latest            
--- a/.gitignore
+++ b/.gitignore
@ -46,5 +46,3 @@ src/plugins/BlueMap/data/minecraft-client-1.21.jar
 src/plugins/BMMarker/data

 src/plugins/LibertyBans/internal
-
-src/plugins/Chunky/tasks
--- a/134
+++ b/134
@ -9,31 +9,29 @@ ADD ./src ${CONFIG_PATH}
 RUN  mkdir ${DATA_PATH}


-# Add symlinks to Minecraft Vanilla files
-RUN mkdir ${DATA_PATH}/Vanilla && \ 
-    touch ${DATA_PATH}/Vanilla/banned-ips.json && \
-        ln -sf ${DATA_PATH}/Vanilla/banned-ips.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/banned-players.json && \
-        ln -sf ${DATA_PATH}/Vanilla/banned-players.json ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/Vanilla/logs && \
-        ln -sf ${DATA_PATH}/Vanilla/logs ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/ops.json && \
-        ln -sf ${DATA_PATH}/Vanilla/ops.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/usercache.json && \
-        ln -sf ${DATA_PATH}/Vanilla/usercache.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/whitelist.json && \
-        ln -sf ${DATA_PATH}/Vanilla/whitelist.json ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/Vanilla/world && \
-        ln -sf ${DATA_PATH}/Vanilla/world ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/Vanilla/world_nether && \
-        ln -sf ${DATA_PATH}/Vanilla/world_nether ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/Vanilla/world_the_end && \
-        ln -sf ${DATA_PATH}/Vanilla/world_the_end ${CONFIG_PATH}
+# Add symlinks to Minecraft default files
+RUN touch ${DATA_PATH}/banned-ips.json && \
+        ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/banned-players.json && \
+        ln -sf ${DATA_PATH}/banned-players.json ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/logs && \
+        ln -sf ${DATA_PATH}/logs ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/ops.json && \
+        ln -sf ${DATA_PATH}/ops.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/usercache.json && \
+        ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/whitelist.json && \
+        ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/world && \
+        ln -sf ${DATA_PATH}/world ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/world_nether && \
+        ln -sf ${DATA_PATH}/world_nether ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/world_the_end && \
+        ln -sf ${DATA_PATH}/world_the_end ${CONFIG_PATH}

 # Add symlinks to PlasmoVoice files
-RUN mkdir ${DATA_PATH}/PlasmoVoice && \
-    touch ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json && \
-    ln -sf ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json \
+RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
+    ln -sf ${DATA_PATH}/pv-voice_mutes.json \
        ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json

 # Add symlinks to SuperVanish files
@ -63,6 +61,12 @@ RUN mkdir -p ${DATA_PATH}/CustomizablePlayerModels && \
    ln -sf ${DATA_PATH}/CustomizablePlayerModels/ \
        ${CONFIG_PATH}/plugins/CustomizablePlayerModels

+# Add symlinks to DiscordSRV files
+RUN mkdir -p ${DATA_PATH}/DiscordSRV && \
+    touch ${DATA_PATH}/DiscordSRV/accounts.aof && \
+    ln -sf ${DATA_PATH}/DiscordSRV/accounts.aof \
+        ${CONFIG_PATH}/plugins/DiscordSRV/accounts.aof
+
 # Add symlinks to BlueMap files
 RUN mkdir -p ${DATA_PATH}/BlueMap/maps && \
    mkdir -p ${DATA_PATH}/BlueMap/logs && \
@ -74,31 +78,10 @@ RUN mkdir -p ${DATA_PATH}/BMMarker/data && \
    ln -sf ${DATA_PATH}/BMMarker/data \
        ${CONFIG_PATH}/plugins/BMMarker/data

-# Add symlinks to Chunky files
-RUN mkdir -p ${DATA_PATH}/Chunky/tasks && \
-    ln -sf ${DATA_PATH}/Chunky/tasks \
-        ${CONFIG_PATH}/plugins/Chunky/tasks
-
-# Generate unicode locale so that cyrillic characters display properly
-RUN apt-get update -y && apt-get install -y locales && \
-    echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    rm -Rf var/lib/apt/lists/*
-ENV LANG en_US.UTF-8
-

 VOLUME ${DATA_PATH}


-# Minecraft
-EXPOSE 25565/tcp
-# BlueMap
-EXPOSE 8100/tcp 
-
-
-ENV GID=988
-ENV UID=999
-
 ENV MEMORY=4G
 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000

@ -110,12 +93,6 @@ ENV LUCKPERMS_DB_NAME=luckperms_db
 ENV LUCKPERMS_DB_USERNAME=luckperms
 ENV LUCKPERMS_DB_PASSWORD=0000

-ENV SKINSRESTORER_DB_HOST=127.0.0.1
-ENV SKINSRESTORER_DB_PORT=3306
-ENV SKINSRESTORER_DB_NAME=skinsrestorer_db
-ENV SKINSRESTORER_DB_USERNAME=skinsrestorer
-ENV SKINSRESTORER_DB_PASSWORD=0000
-
 ENV COREPROTECT_DB_HOST=127.0.0.1
 ENV COREPROTECT_DB_PORT=3306
 ENV COREPROTECT_DB_NAME=coreprotect_db
@ -128,45 +105,23 @@ ENV LIBERTYBANS_DB_NAME=libertybans_db
 ENV LIBERTYBANS_DB_USERNAME=libertybans
 ENV LIBERTYBANS_DB_PASSWORD=0000

+
+ENV DISCORDSRV_BOT_TOKEN=dummy-token
+
 ENV GRIM_DB_HOST=127.0.0.1
 ENV GRIM_DB_PORT=3306
 ENV GRIM_DB_NAME=luckperms
 ENV GRIM_DB_USERNAME=luckperms
 ENV GRIM_DB_PASSWORD=0000

-ENV DISCORDSRV_BOT_TOKEN=dummy-token
-
-ENV DISCORDSRV_DB_HOST=127.0.0.1
-ENV DISCORDSRV_DB_PORT=3306
-ENV DISCORDSRV_DB_NAME=discordsrv_db
-ENV DISCORDSRV_DB_USERNAME=discordsrv
-ENV DISCORDSRV_DB_PASSWORD=0000
-
-
 WORKDIR ${WORKDIR_PATH}/config

+# Minecraft
+EXPOSE 25565/tcp
+# BlueMap
+EXPOSE 8100/tcp 
+
 CMD \
-    # Remove after migrated
-    mkdir -p ${DATA_PATH}/Vanilla && \
-    if [ -e ${DATA_PATH}/banned-ips.json ]; then mv ${DATA_PATH}/banned-ips.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/banned-players.json ]; then mv ${DATA_PATH}/banned-players.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/logs ]; then mv ${DATA_PATH}/logs ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/ops.json ]; then mv ${DATA_PATH}/ops.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/usercache.json ]; then mv ${DATA_PATH}/usercache.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/whitelist.json ]; then mv ${DATA_PATH}/whitelist.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/world ]; then mv ${DATA_PATH}/world ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/world_nether ]; then mv ${DATA_PATH}/world_nether ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/world_the_end ]; then mv ${DATA_PATH}/world_the_end ${DATA_PATH}/Vanilla; fi && \
-    mkdir -p ${DATA_PATH}/PlasmoVoice && \
-    if [ -e ${DATA_PATH}/pv-voice_mutes.json ]; then mv ${DATA_PATH}/pv-voice_mutes.json ${DATA_PATH}/PlasmoVoice; fi && \
-
-    # Create and switch to user with desired UID and GID.
-    # All processes that create/change files in ${DATA_PATH}
-    # must be run under this user.
-    groupadd -g ${GID} worker && \
-    useradd -M -g ${GID} -u ${UID} worker && \
-    chmod -R o-rwx ${WORKDIR_PATH} && \
-
    # Add proxy secret
    sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \

@ -180,13 +135,6 @@ CMD \
    sed -i "s/_LUCKPERMS_DB_USERNAME_/${LUCKPERMS_DB_USERNAME}/g" plugins/LuckPerms/config.yml && \
    sed -i "s/_LUCKPERMS_DB_PASSWORD_/${LUCKPERMS_DB_PASSWORD}/g" plugins/LuckPerms/config.yml && \

-    # Add database info to skinsrestorer config
-    sed -i "s/_SKINSRESTORER_DB_HOST_/${SKINSRESTORER_DB_HOST}/g" plugins/SkinsRestorer/config.yml && \
-    sed -i "s/_SKINSRESTORER_DB_PORT_/${SKINSRESTORER_DB_PORT}/g" plugins/SkinsRestorer/config.yml && \
-    sed -i "s/_SKINSRESTORER_DB_NAME_/${SKINSRESTORER_DB_NAME}/g" plugins/SkinsRestorer/config.yml && \
-    sed -i "s/_SKINSRESTORER_DB_USERNAME_/${SKINSRESTORER_DB_USERNAME}/g" plugins/SkinsRestorer/config.yml && \
-    sed -i "s/_SKINSRESTORER_DB_PASSWORD_/${SKINSRESTORER_DB_PASSWORD}/g" plugins/SkinsRestorer/config.yml && \
-
    # Add coreprotect database secrets
    sed -i "s/_COREPROTECT_DB_HOST_/${COREPROTECT_DB_HOST}/g" plugins/CoreProtect/config.yml && \
    sed -i "s/_COREPROTECT_DB_PORT_/${COREPROTECT_DB_PORT}/g" plugins/CoreProtect/config.yml && \
@ -211,15 +159,5 @@ CMD \
    # Add DiscordSRV bot token
    sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \

-    # Add database info to DiscordSRV config
-    sed -i "s/_DISCORDSRV_DB_HOST_/${DISCORDSRV_DB_HOST}/g" plugins/DiscordSRV/config.yml && \
-    sed -i "s/_DISCORDSRV_DB_PORT_/${DISCORDSRV_DB_PORT}/g" plugins/DiscordSRV/config.yml && \
-    sed -i "s/_DISCORDSRV_DB_NAME_/${DISCORDSRV_DB_NAME}/g" plugins/DiscordSRV/config.yml && \
-    sed -i "s/_DISCORDSRV_DB_USERNAME_/${DISCORDSRV_DB_USERNAME}/g" plugins/DiscordSRV/config.yml && \
-    sed -i "s/_DISCORDSRV_DB_PASSWORD_/${DISCORDSRV_DB_PASSWORD}/g" plugins/DiscordSRV/config.yml && \
-
-    # Change UID and GID of used files to desired values.
-    chown -R worker:worker ${WORKDIR_PATH} && \
-
    # Launch
-    su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseZGC -XX:+ZGenerational -XX:+AlwaysPreTouch -XX:+UseStringDeduplication -jar *.jar -nogui"
+    java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui
--- a/src/bukkit.yml
+++ b/src/bukkit.yml
@ -1,4 +1,3 @@
-# https://bukkit.fandom.com/wiki/Bukkit.yml
 settings:
  allow-end: false
  warn-on-overload: true
@ -22,12 +21,12 @@ spawn-limits:
 chunk-gc:
  period-in-ticks: 600
 ticks-per:
-  animal-spawns: -1
-  monster-spawns: -1
-  water-spawns: -1
-  water-ambient-spawns: -1
-  water-underground-creature-spawns: -1
-  axolotl-spawns: -1
-  ambient-spawns: -1
+  animal-spawns: 400
+  monster-spawns: 1
+  water-spawns: 1
+  water-ambient-spawns: 1
+  water-underground-creature-spawns: 1
+  axolotl-spawns: 1
+  ambient-spawns: 1
  autosave: 6000
 aliases: now-in-commands.yml
--- a/src/config/paper-global.yml
+++ b/src/config/paper-global.yml
@ -79,8 +79,8 @@ misc:
 packet-limiter:
  all-packets:
    action: KICK
-    interval: 1.0
-    max-packet-rate: 200.0
+    interval: 7.0
+    max-packet-rate: 500.0
  kick-message: <red><lang:disconnect.exceeded_packet_rate>
  overrides:
    ServerboundPlaceRecipePacket:
@ -122,15 +122,14 @@ timings:
  url: https://timings.aikar.co/
  verbose: true
 unsupported-settings:
-  allow-headless-pistons: true
-  allow-permanent-block-break-exploits: true
-  allow-piston-duplication: true
-  allow-tripwire-disarming-exploits: true
-  allow-unsafe-end-portal-teleportation: true
+  allow-headless-pistons: false
+  allow-permanent-block-break-exploits: false
+  allow-piston-duplication: false
+  allow-tripwire-disarming-exploits: false
+  allow-unsafe-end-portal-teleportation: false
  compression-format: ZLIB
-  perform-username-validation: false
+  perform-username-validation: true
  skip-vanilla-damage-tick-when-shield-blocked: false
-  update-equipment-on-player-actions: false
 watchdog:
  early-warning-delay: 10000
  early-warning-every: 5000
--- a/src/config/paper-world-defaults.yml
+++ b/src/config/paper-world-defaults.yml
@ -56,7 +56,7 @@ anticheat:
      hide-itemmeta-with-visual-effects: false
 chunks:
  auto-save-interval: default
-  delay-chunk-unloads-by: 0s
+  delay-chunk-unloads-by: 10s
  entity-per-chunk-save-limit:
    arrow: -1
    ender_pearl: -1
@ -65,14 +65,14 @@ chunks:
    small_fireball: -1
    snowball: -1
  fixed-chunk-inhabited-time: -1
-  flush-regions-on-save: true
-  max-auto-save-chunks-per-tick: 200
+  flush-regions-on-save: false
+  max-auto-save-chunks-per-tick: 24
  prevent-moving-into-unloaded-chunks: false
 collisions:
-  allow-player-cramming-damage: true
+  allow-player-cramming-damage: false
  allow-vehicle-collisions: true
  fix-climbing-bypassing-cramming-rule: false
-  max-entity-collisions: 4096
+  max-entity-collisions: 8
  only-players-collide: false
 command-blocks:
  force-follow-perm-level: true
@ -80,10 +80,8 @@ command-blocks:
 entities:
  armor-stands:
    do-collision-entity-lookups: true
-    tick: false
+    tick: true
  behavior:
-    cooldown-failed-beehive-releases: false
-    only-merge-items-horizontally: true
    allow-spider-world-border-climbing: true
    baby-zombie-movement-modifier: 0.5
    disable-chest-cat-detection: false
@ -107,9 +105,9 @@ entities:
      skeletons: false
      zombies: false
    nerf-pigmen-from-nether-portals: false
-    parrots-are-unaffected-by-player-movement: true
+    parrots-are-unaffected-by-player-movement: false
    phantoms-do-not-spawn-on-creative-players: true
-    phantoms-only-attack-insomniacs: false
+    phantoms-only-attack-insomniacs: true
    phantoms-spawn-attempt-max-seconds: 119
    phantoms-spawn-attempt-min-seconds: 60
    piglins-guard-chests: true
@ -175,8 +173,13 @@ entities:
    duplicate-uuid:
      mode: SAFE_REGEN
      safe-regen-delete-range: 32
-    filter-bad-tile-entity-nbt-from-falling-blocks: false
-    filtered-entity-tag-nbt-paths: []
+    filter-bad-tile-entity-nbt-from-falling-blocks: true
+    filtered-entity-tag-nbt-paths:
+    - Pos
+    - Motion
+    - SleepingX
+    - SleepingY
+    - SleepingZ
    iron-golems-can-spawn-in-air: false
    monster-spawn-max-light-level: default
    non-player-arrow-despawn-rate: default
@ -238,7 +241,7 @@ environment:
  max-block-ticks: 65536
  max-fluid-ticks: 65536
  nether-ceiling-void-damage-height: disabled
-  optimize-explosions: true
+  optimize-explosions: false
  portal-create-radius: 16
  portal-search-radius: 128
  portal-search-vanilla-dimension-scaling: true
@ -254,14 +257,14 @@ fishing-time-range:
  maximum: 600
  minimum: 100
 fixes:
-  disable-unloaded-chunk-enderpearl-exploit: false
+  disable-unloaded-chunk-enderpearl-exploit: true
  falling-block-height-nerf: disabled
  fix-items-merging-through-walls: false
  prevent-tnt-from-moving-in-water: false
  split-overstacked-loot: true
  tnt-entity-height-nerf: disabled
 hopper:
-  cooldown-when-full: false
+  cooldown-when-full: true
  disable-move-event: false
  ignore-occluding-blocks: false
 lootables:
@ -290,7 +293,7 @@ misc:
  redstone-implementation: VANILLA
  shield-blocking-delay: 5
  show-sign-click-command-failure-msgs-to-player: false
-  update-pathfinding-on-block-update: false
+  update-pathfinding-on-block-update: true
 scoreboards:
  allow-non-player-entities-on-scoreboards: true
  use-vanilla-world-scoreboard-name-coloring: false
@ -309,5 +312,5 @@ tick-rates:
      secondarypoisensor: 40
  wet-farmland: 1
 unsupported-settings:
-  disable-world-ticking-when-empty: true
+  disable-world-ticking-when-empty: false
  fix-invulnerable-end-crystal-exploit: true
--- a/src/plugins/BMMarker/settings.json
+++ b/src/plugins/BMMarker/settings.json
@ -1,5 +1,5 @@
 {
    "language": "en",
-    "maxUserSets": 100,
-    "maxUserMarker": 1000
-}
+    "maxUserSets": 1,
+    "maxUserMarker": 5
+}
--- a/src/plugins/CarbonChat/channels/global.conf
+++ b/src/plugins/CarbonChat/channels/global.conf
@ -20,7 +20,7 @@ format {
    #     }
    # 
    basic {
-        "default_format"="<dark_grey>[<color:#4cd964>Global</color>]</dark_grey> %luckperms_prefix%<white><username> <grey>></grey> <message></white>"
+        "default_format"="<dark_gray>[</dark_gray><color:#00ffff>G</color><dark_gray>]</dark_gray> %luckperms_prefix% <gray><username>: <message></gray>"
        discord="<message>"
        console="[G] <username>: <message>"
    }
--- a/src/plugins/CarbonChat/channels/local.conf
+++ b/src/plugins/CarbonChat/channels/local.conf
@ -20,7 +20,7 @@ format {
    #     }
    # 
    basic {
-        "default_format"="<dark_grey>[<#e6c67a>Local</#e6c67a>]</dark_grey> %luckperms_prefix%<grey><username></grey> <dark_grey>></dark_grey> <grey><message></grey>"
+        "default_format"="<dark_gray>[</dark_gray><gray>L</gray><dark_gray>]</dark_gray> %luckperms_prefix% <gray><username>: <message></gray>"
        discord="<message>"
        console="[<channel>] <username>: <message>"
    }
--- a/src/plugins/CarbonChat/command-settings.conf
+++ b/src/plugins/CarbonChat/command-settings.conf
@ -43,7 +43,7 @@ settings {
        ]
    }
    "carbon:unmute" {
-        enabled=false
+        enabled=true
        name=unmute
        aliases=[]
    }
@ -100,7 +100,7 @@ settings {
        ]
    }
    "carbon:muteinfo" {
-        enabled=false
+        enabled=true
        name=muteinfo
        aliases=[
            muted
@ -114,7 +114,7 @@ settings {
        ]
    }
    "carbon:mute" {
-        enabled=false
+        enabled=true
        name=mute
        aliases=[]
    }
--- a/src/plugins/CarbonChat/locale/messages-en_US.properties
+++ b/src/plugins/CarbonChat/locale/messages-en_US.properties
@ -153,10 +153,10 @@ reply.target.self=<red>You cannot whisper to yourself
 whisper.console=<gold>[<green><sender_display_name></green>] -> [<green><recipient_display_name></green>] <message>
 whisper.continue.target_missing=<red>You have no one to whisper
 whisper.error=<red>Failed to send private message
-whisper.from=<click\:suggest_command\:'/whisper <sender_username> '><hover\:show_text\:'Click to start a reply'><dark_grey>[<grey><sender_display_name></grey>] -> [<grey>You</grey>] <grey>></grey> <message>
+whisper.from=<click\:suggest_command\:'/whisper <sender_username> '><hover\:show_text\:'Click to start a reply'><gold>[<green><sender_display_name></green>] -> [<green>You</green>] <message>
 whisper.ignored_by_target=<red><target> <red>is ignoring you
 whisper.ignoring_all=<red>You cannot send messages while they are ignored\!
 whisper.ignoring_target=<red>You are ignoring <target>
-whisper.to=<click\:suggest_command\:'/whisper <recipient_username> '><hover\:show_text\:'Click to start another message to <recipient_display_name>'><dark_grey>[<grey>You</grey>] -> [<grey><recipient_display_name></grey>] <grey>></grey> <message>
+whisper.to=<click\:suggest_command\:'/whisper <recipient_username> '><hover\:show_text\:'Click to start another message to <recipient_display_name>'><gold>[<green>You</green>] -> [<green><recipient_display_name></green>] <message>
 whisper.toggled.off=No longer receiving private messages.
 whisper.toggled.on=Now receiving private messages.
--- a/src/plugins/Chunky-Bukkit-1.4.40.jar
+++ b/src/plugins/Chunky-Bukkit-1.4.40.jar
--- a/src/plugins/Chunky/config.yml
+++ b/src/plugins/Chunky/config.yml
@ -1,9 +0,0 @@
-# Chunky Configuration
-# https://github.com/pop4959/Chunky/wiki/Configuration
-
-version: 2
-language: en
-continue-on-restart: false
-force-load-existing-chunks: false
-silent: false
-update-interval: 5
--- a/src/plugins/Clumps-5.0.jar
+++ b/src/plugins/Clumps-5.0.jar
--- a/src/plugins/Clumps/config.yml
+++ b/src/plugins/Clumps/config.yml
@ -1,55 +0,0 @@
-# XP Clumps Plugin Configuration
-
-# The radius within which XP orbs will merge (in blocks)
-merge-radius: 2.0
-
-# Minimum XP amount required in an orb for it to be merged with others
-min-xp-to-merge: 5
-
-# How often (in seconds) the plugin checks and merges XP orbs in each world
-merge-interval-seconds: 10
-
-# The radius within which XP orbs will be instantly collected by players
-instant-collect-radius: 1
-
-# Enable or disable the instant collection of XP orbs by players within the defined radius
-enable-instant-collect: true
-
-# Enable or disable the merging of XP orbs across the server
-enable-merging: true
-
-# The XP boost multiplier for players collecting XP near merged XP orbs (percentage as a multiplier)
-xp-boost-multiplier: 1.1  # 10% XP boost
-
-# Enable or disable the XP boost feature for players near merging XP orbs
-enable-xp-boost: false
-
-# Enable or disable particle effects when XP orbs merge (visual animations)
-enable-merge-animations: true
-
-# Prevent duplication of XP orbs (to avoid excessive orb spawning)
-prevent-orb-duplication: true
-
-# World-specific settings (if you want different settings for different worlds)
-world-settings:
-  # Example of how to configure world-specific settings for merging XP orbs
-  # These settings will override the global settings for specific worlds
-  overworld:
-    merge-radius: 2.0
-    min-xp-to-merge: 5
-    merge-interval-seconds: 10
-    enable-instant-collect: true
-    enable-merging: true
-    xp-boost-multiplier: 1.1
-    enable-xp-boost: true
-    enable-merge-animations: true
-  nether:
-    merge-radius: 3.0  # Different radius for the Nether
-    min-xp-to-merge: 10
-    merge-interval-seconds: 15  # Longer interval for Nether
-    enable-instant-collect: false  # Disabled instant collect in the Nether
-    enable-merging: true
-    xp-boost-multiplier: 1.2  # Higher XP boost in the Nether
-    enable-xp-boost: true
-    enable-merge-animations: false  # Disable animations in the Nether
-
--- a/src/plugins/CommandWhitelist-Bukkit-2.12.0.jar
+++ b/src/plugins/CommandWhitelist-Bukkit-2.12.0.jar
--- a/src/plugins/CommandWhitelist/config.yml
+++ b/src/plugins/CommandWhitelist/config.yml
@ -1,81 +0,0 @@
-
-# Messages use MiniMessage formatting (https://docs.adventure.kyori.net/minimessage/format)
-messages:
-  prefix: ''
-  command_denied: ''
-  subcommand_denied: ''
-  no_permission: ''
-  no_such_subcommand: ''
-  config_reloaded: <yellow>Configuration reloaded.
-  added_to_whitelist: <yellow>Whitelisted command <gold>%s <yellow>for permission
-    <gold>%s
-  removed_from_whitelist: <yellow>Removed command <gold>%s <yellow>from permission
-    <gold>%s
-  group_doesnt_exist: <red>Group doesn't exist or error occured
-
-# Do not enable if you don't have issues with aliased commands.
-# This requires server restart to take effect.
-use_protocollib: false
-
-# Valid message types are CHAT and ACTIONBAR. Does nothing on velocity.
-message_type: CHAT
-groups:
-  default:
-    commands:
-    - tell
-    - reply
-    - ignore
-    - unignore
-    - discord
-    - imageframe
-    subcommands:
-    - discord ?
-    - discord help
-    - discord link
-    - discord linked
-    - discord clearlinked
-  role_moder:
-    commands:
-    - ban
-    - unban
-    - ipban
-    - unbanip
-    - banlist
-    - mute
-    - unmute
-    - ipmute
-    - unmuteip
-    - mutelist
-    - warn
-    - unwarn
-    - ipwarn
-    - unwarnip
-    - warns
-    - history
-    - alts
-    - kick
-    - ipkick
-    - blame
-    - vanish
-    - openender
-    - openinv
-    - grim
-    - coreprotect
-    - vmute
-    - vunmute
-    - vmutelist
-    - gamemode
-    - tp
-    subcommands:
-    - gamemode adventure
-    - gamemode creative
-  role_admin:
-    commands:
-    - luckperms
-    - searchender
-    - searchenchant
-    - searchcontainer
-    - bmarker
-    - bmarker-setup
-    - bmarker-setup-set
-    subcommands: []
--- a/src/plugins/DiscordSRV/config.yml
+++ b/src/plugins/DiscordSRV/config.yml
@ -27,22 +27,22 @@ BotToken: "_DISCORDSRV_BOT_TOKEN_"
 #
 # Первая часть пар каналов не является названием канала Discord!
 # Выполните "/discord reload" после изменения этого опции для применения
-Channels: {"carbon:global": "1401248428087836803"}
+Channels: {"global": "1394245250096173076"}

 # Канал для вывода сообщений Консоли (НЕ ИМЯ); оставьте пустым, чтобы отключить консольный канал
 DiscordConsoleChannelId: ""

 # Ссылка на приглашение, отображаемая игрокам при использовании /discord, и в сообщении, отображаемом несвязанным игрокам при обязательной привязке.
-DiscordInviteLink: "https://discord.gg/5ZnJD4yDBq"
+DiscordInviteLink: "https://discord.gg/xsyy7d8RfG"

 # Эксперименты
 # Эти функции не полностью оптимизированы; Используйте на свой риск

 # JDBC (MySQL/MariaDB)
-Experiment_JdbcAccountLinkBackend: "jdbc:mysql://_DISCORDSRV_DB_HOST_:_DISCORDSRV_DB_PORT_/_DISCORDSRV_DB_NAME_?autoReconnect=true&useSSL=false"
-Experiment_JdbcTablePrefix: "discordsrv"
-Experiment_JdbcUsername: "_DISCORDSRV_DB_USERNAME_"
-Experiment_JdbcPassword: "_DISCORDSRV_DB_PASSWORD_"
+Experiment_JdbcAccountLinkBackend: "jdbc:mysql://HOST:PORT/NAME?autoReconnect=true&useSSL=false"
+Experiment_JdbcTablePrefix: ""
+Experiment_JdbcUsername: ""
+Experiment_JdbcPassword: ""

 # Webhook Delivery
 Experiment_WebhookChatMessageDelivery: false
@ -72,7 +72,7 @@ MaximumAttemptsForSystemDNSBeforeUsingFallbackDNS: 3
 TimestampFormat: EEE, d. MMM yyyy HH:mm:ss z
 DateFormat: yyyy-MM-dd
 # https://docs.discordsrv.com/config/#Timezone
-Timezone: Europe/Kiev
+Timezone: default
 # MinecraftMentionSound: Должен ли звук посылаться игроку в Minecraft при упоминании из Discord
 MinecraftMentionSound: true

@ -101,7 +101,7 @@ UseModernPaperChatEvent: false
 # StatusUpdateRateInMinutes: Как часто (в минутах) менять статус (если их несколько)
 DiscordGameStatus: ["Синхронизирует Бебру"]
 DiscordOnlineStatus: ONLINE
-StatusUpdateRateInMinutes: 1
+StatusUpdateRateInMinutes: 2

 # Настройка канала чата
 # Канал чата предназначен для вывода всех внутриигровых сообщений, а также всех публичных сообщений, которыми обмениваются игроки
@ -128,14 +128,14 @@ StatusUpdateRateInMinutes: 1
 # DiscordChatChannelRolesSelection: список ролей, которые должны быть отфильтрованы по всем ролям пользователя.
 # DiscordChatChannelRoleAliases: список псевдонимов ролей (альтернативные имена для ролей для использования в сообщениях Minecraft)
 #
-DiscordChatChannelDiscordToMinecraft: false
-DiscordChatChannelMinecraftToDiscord: false
+DiscordChatChannelDiscordToMinecraft: true
+DiscordChatChannelMinecraftToDiscord: true
 DiscordChatChannelTruncateLength: 256
 DiscordChatChannelTranslateMentions: true
 DiscordChatChannelAllowedMentions: [user, channel, emote]
 DiscordChatChannelEmojiBehavior: "name"
 DiscordChatChannelEmoteBehavior: "name"
-DiscordChatChannelPrefixRequiredToProcessMessage: "#"
+DiscordChatChannelPrefixRequiredToProcessMessage: "!д"
 DiscordChatChannelPrefixActsAsBlacklist: false
 DiscordChatChannelRolesAllowedToUseColorCodesInChat: ["Developer", "Owner", "Admin", "Moderator"]
 DiscordChatChannelBroadcastDiscordMessagesToConsole: true
@ -299,7 +299,7 @@ DiscordCannedResponses: {"!ip": "bebrashield.net", "!site": "https://bebrashield
 #
 MinecraftDiscordAccountLinkedConsoleCommands: ["", "", ""]
 MinecraftDiscordAccountUnlinkedConsoleCommands: ["", "", ""]
-MinecraftDiscordAccountLinkedRoleNameToAddUserTo: "1399136491090739210"
+MinecraftDiscordAccountLinkedRoleNameToAddUserTo: "Бебра"
 MinecraftDiscordAccountLinkedAllowRelinkBySendingANewCode: true
 MinecraftDiscordAccountLinkedUsePM: true
 MinecraftDiscordAccountLinkedMessageDeleteSeconds: 0
--- a/src/plugins/DiscordSRV/linking.yml
+++ b/src/plugins/DiscordSRV/linking.yml
@ -14,7 +14,7 @@ Require linked account to play:
  # Если вы не знаете, что это такое - не трогайте.

  # Ники в Minecraft, которые могут заходить на сервер без подписки/привязки?
-  Bypass names: []
+  Bypass names: [Scarsz, Vankka]
  # Имеют ли люди из ванильного вайтлиста право входить на сервер без подписки/привязки?
  Whitelisted players bypass check: true
  # Разрешить или запретить игрокам из бан-листа VANILLA связывать свои аккаунты
@ -26,7 +26,7 @@ Require linked account to play:
  # Используйте {BOT} в качестве заполнителя для имени бота
  # Используйте {CODE} в качестве заполнителя для кода, который надо отправить боту
  # Используйте {INVITE} в качестве заполнителя для ссылки-приглашения, которая необходима людям для присоединения к серверу Discord (использует DiscordInviteLink, настроенный в config.yml)
-  Not linked message: "&7Вы должны связать свою учетную запись &9Discord&7, чтобы играть.\n\n&7Отправьте сообщение боту &#e6c67a{BOT}&7 на сервере Discord с кодом &#e6c67a{CODE}&7, чтобы привязать аккаунт."
+  Not linked message: "&7Вы должны связать свою учетную запись &9Discord&7, чтобы играть.\n\n&7Отправьте сообщение боту &b{BOT}&7 на сервере Discord с кодом &b{CODE}&7, чтобы привязать аккаунт.\n\n&7Ссылка-приглашение » &b{INVITE}"

  # Если включено, игрокам нужно будет не только связать свои аккаунты, но и потребуется
  # быть участником сервера Discord, на котором находится бот.
@ -44,10 +44,10 @@ Require linked account to play:

  # Можно требовать не только привязку аккаунта, но и наличие специальной роли, например Twitch
  Subscriber role:
-    Require subscriber role to join: true
-    Subscriber roles: ["1399048944482259135", "1399048955291111495", "1399048958147301407", "1371492083281563728", ""]
+    Require subscriber role to join: false
+    Subscriber roles: ["00000000000000000", "00000000000000000", "00000000000000000"]
    Require all of the listed roles: false # при значении false требуется только одна из указанных выше ролей, при true - все роли.
-    Kick message: "&cВы должны пройти верификацию модерации на сервере Discord, чтобы иметь возможность играть."
+    Kick message: "&cВы должны быть подписаны на Twitch, чтобы иметь возможность играть."

  Messages:
    DiscordSRV still starting: "&cВ настоящее время невозможно проверить состояние ссылки, поскольку сервер все еще подключается к Discord.\n\nПопробуйте еще раз через минуту."
--- a/src/plugins/DiscordSRV/messages.yml
+++ b/src/plugins/DiscordSRV/messages.yml
@ -367,7 +367,7 @@ MinecraftPlayerAchievementMessage:
 # %tps%:           средний TPS сервера
 # Также поддерживаются PlaceholderAPI шаблоны
 #
-ChannelTopicUpdaterChatChannelTopicFormat: "%playercount% игроков онлайн | %totalplayers% игроков было всего | Сервер запущен уже %uptimemins% минут | Обновлено: %date%"
+ChannelTopicUpdaterChatChannelTopicFormat: "%playercount%/%playermax% игроков онлайн | %totalplayers% уникальных игроков | Сервер запущен уже %uptimemins% минут | Обновлено: %date%"
 ChannelTopicUpdaterConsoleChannelTopicFormat: "TPS: %tps% | Mem: %usedmemorygb%GB исп/%freememorygb%GB своб/%maxmemorygb%GB макс | %serverversion%"
 # AtServerShutdownFormats поддерживает только %totalplayers%, %serverversion%, & %date% / %time%
 ChannelTopicUpdaterChatChannelTopicAtServerShutdownFormat: "Сервер отключён | %totalplayers% уникальных игроков"
--- a/src/plugins/DiscordSRV/synchronization.yml
+++ b/src/plugins/DiscordSRV/synchronization.yml
@ -33,7 +33,7 @@ NicknameSynchronizationFormat: "%displayname%"
 # GroupRoleSynchronizationCycleTime: Время (в минутах) - как часто DiscordSRV будет синхронизировать роли и группы игроков.
 # GroupRoleSynchronizationCycleCompletely: должна ли синхронизация, запущенная по таймеру, синхронизировать каждого участника на серверах Discord ботов
 #
-GroupRoleSynchronizationGroupsAndRolesToSync: {"role_player": "1399136491090739210"}
+GroupRoleSynchronizationGroupsAndRolesToSync: {"player": "1371491528786182216"}
 GroupRoleSynchronizationMinecraftIsAuthoritative: true
 GroupRoleSynchronizationOneWay: false
 GroupRoleSynchronizationEnableDenyPermission: false
--- a/src/plugins/ImageFrame/config.yml
+++ b/src/plugins/ImageFrame/config.yml
@ -121,8 +121,7 @@ Settings:
  # For example "imageframe.createlimit.vip"
  # Players with no groups will be treated as "default" unless they have "imageframe.createlimit.unlimited"
  PlayerCreationLimit:
-    default: 3
-    role_elder: 10
+    default: 10
    vip: 15
    moderator: 20
  # Max amount of markers on an individual map
--- a/src/plugins/LibertyBans/config.yml
+++ b/src/plugins/LibertyBans/config.yml
@ -9,13 +9,11 @@ durationPermissions:
   # Specify all the durations which you want to explicitly grant permission for.
  permissions-to-check:
    - 'perm'
-    - '7d'
-    - '14d'
-    - '28d'
-    - '90d'
-    - '180d'
+    - '4h'
+    - '30d'
+    - '10d'
   # If disabled, players are not checked for duration permissions.
-  enable: true
+  enable: false

 # Formatting of absolute dates
 date-formatting:
@ -27,7 +25,7 @@ date-formatting:

 # What language file should be used for messages?
 # For example, 'en' means LibertyBans will look for a file called 'messages_en.yml'
-lang-file: 'ru'
+lang-file: 'en'
 # Options related to punishment enforcement and alt account checking
 # 
 # -- Alt Account Enforcement and Checking --
--- a/src/plugins/LibertyBans/lang/messages_en.yml
+++ b/src/plugins/LibertyBans/lang/messages_en.yml
@ -149,6 +149,7 @@ additions:
      - ''
      - '&3&lAppeal Your Punishment&f'
      - '&cWebsite: &7https://bebrashield.net&f'
+      - '&cDiscord: &7https://discord.gg/xsyy7d8RfG'
    permission:
      duration: '&cYou may not do this for &e%DURATION%&c.'
      both: '&cYou may not do this to players and their IP addresses.'
@ -479,7 +480,7 @@ all:
     # The prefix to use
    value: '&6&lLibertyBans &8»&7 '
     # If enabled, all messages will be prefixed
-    enable: false
+    enable: true

   # This section is only relevant if using the server scopes feature
  scopes:
--- a/src/plugins/LibertyBans/lang/messages_ru.yml
+++ b/src/plugins/LibertyBans/lang/messages_ru.yml
@ -134,7 +134,7 @@ all:
  base-permission-message: '&cТы уверен, что оно тебе нужно? К слову, права на эту команду у тебя нет.'
  prefix:
    # If enabled, all messages will be prefixed
-    enable: false
+    enable: true
    # The prefix to use
    value: '&6&lLibertyBans &8»&7 '

@ -197,8 +197,8 @@ additions:
      - '&cПричина&f'
      - '&7%REASON%&f'
      - ''
-      - '&3По поводу разбана пишите администрации:&f'
-      - '&cWebsite: &7https://bebrashield.net&f'
+      - '&3По поводу разбана пишите в тех.поддержку:&f'
+      - '&cwww.support.com'
    permission:
      duration: '&cТебе нельзя банить на &e%DURATION%&c.'
      both: '&cВы не можете блокировать игроков.'
--- a/src/plugins/LibertyBans/sql.yml
+++ b/src/plugins/LibertyBans/sql.yml
@ -77,11 +77,11 @@ timeouts:

 # Authentication details for remote databases: used for MariaDB, MySQL, PostgreSQL, and CockroachDB.
 auth-details:
-  host: '_LIBERTYBANS_DB_HOST_'
-  port: _LIBERTYBANS_DB_PORT_
-  database: '_LIBERTYBANS_DB_NAME_'
-  user: '_LIBERTYBANS_DB_USERNAME_'
-  password: '_LIBERTYBANS_DB_PASSWORD_'
+  database: 'minecraft_db'
+  password: '0000'
+  user: 'minecraft'
+  host: '127.0.0.1'
+  port: 3306

 # The values in this section only apply when using a MariaDB or MySQL database
 mariadb:
@ -111,7 +111,7 @@ use-traditional-jdbc-url: false
 # 'MYSQL' - Requires an external MySQL database. At least MySQL 8.0 is required.
 # 'POSTGRES' - Requires an external PostgreSQL database. At least PostgreSQL 12 is required.
 # 'COCKROACH' - Requires an external CockroachDB database. The latest CockroachDB is required. Warning: this option is strictly experimental.
-rdms-vendor: 'MARIADB'
+rdms-vendor: 'HSQLDB'
 # 
 # How large should the connection pool be?
 # A thread pool of similar size is derived from the connection pool size.
--- a/src/plugins/LuckPerms/config.yml
+++ b/src/plugins/LuckPerms/config.yml
@ -31,7 +31,7 @@
 # - When set to "global" this setting is effectively ignored.
 # - In all other cases, the value here is added to all players in a "server" context.
 # - See: https://luckperms.net/wiki/Context
-server: survival
+server: lobby

 # If the servers own UUID cache/lookup facility should be used when there is no record for a player
 # already in LuckPerms.
@ -404,13 +404,11 @@ auto-install-translations: true
 meta-formatting:
  prefix:
    format:
-      - highest_on_track_roles
-      - highest_on_track_clans
-      
+      - "highest"
    duplicates: first-only
-    start-spacer: "<dark_grey>[</dark_grey>"
-    middle-spacer: "<dark_grey>]</dark_grey> <dark_grey>[</dark_grey>"
-    end-spacer: "<dark_grey>] </dark_grey>"
+    start-spacer: "["
+    middle-spacer: " "
+    end-spacer: "]"
  suffix:
    format:
      - "highest"
--- a/src/plugins/Orebfuscator/config.yml
+++ b/src/plugins/Orebfuscator/config.yml
@ -220,11 +220,11 @@ proximity:
    - world
    distance: 24
    frustumCulling:
-      enabled: false
+      enabled: true
      minDistance: 3.0
      fov: 80.0
    rayCastCheck:
-      enabled: false
+      enabled: true
      onlyCheckCenter: true
    useBlockBelow: true
    hiddenBlocks:
--- a/src/plugins/SeeMore-1.0.2.jar
+++ b/src/plugins/SeeMore-1.0.2.jar
--- a/src/plugins/SeeMore/config.yml
+++ b/src/plugins/SeeMore/config.yml
@ -1,20 +0,0 @@
-# Configuration for SeeMore.
-
-# Please don't change this!
-version: 2
-
-# The delay (in ticks) before a player's view distance is lowered after their client settings change.
-#  * This stops players overloading the server by constantly changing their view distance.
-update-delay: 600
-
-# Whether the plugin should log to the console when it changes a player's view distance.
-log-changes: true
-
-# These settings can be specified per world.
-#  * Note: If a world is not listed here or if a setting is missing, it will use the settings listed under the default
-#    section.
-world-settings:
-  default:
-    # The maximum view distance a player in this world can have.
-    # Set to -1 to use the server's configured view distance for this world.
-    maximum-view-distance: -1
--- a/src/plugins/SkinsRestorer/config.yml
+++ b/src/plugins/SkinsRestorer/config.yml
@ -56,15 +56,15 @@ messages:
 # [!] Make sure to fill in database.connectionOptions if you're using certificate / ssl authentication. [!]
 # [!] If you're not using ssl, change sslMode=trust to sslMode=disable [!]
 database:
-    enabled: true
-    host: _SKINSRESTORER_DB_HOST_
-    port: _SKINSRESTORER_DB_PORT_
-    database: _SKINSRESTORER_DB_NAME_
-    username: _SKINSRESTORER_DB_USERNAME_
-    password: '_SKINSRESTORER_DB_PASSWORD_'
+    enabled: false
+    host: localhost
+    port: 3306
+    database: db
+    username: root
+    password: pass
    maxPoolSize: 10
    tablePrefix: sr_
-    connectionOptions: sslMode=disabled&serverTimezone=UTC
+    connectionOptions: sslMode=trust&serverTimezone=UTC

 ############
 # Commands #
--- a/src/plugins/UnifiedMetrics/config.yml
+++ b/src/plugins/UnifiedMetrics/config.yml
@ -1,14 +0,0 @@
-server:
-  name: "survival"
-metrics:
-  enabled: true
-  driver: "prometheus"
-  collectors:
-    systemGc: true
-    systemMemory: true
-    systemProcess: true
-    systemThread: true
-    server: true
-    world: true
-    tick: true
-    events: true
--- a/src/plugins/UnifiedMetrics/driver/prometheus.yml
+++ b/src/plugins/UnifiedMetrics/driver/prometheus.yml
@ -1,16 +0,0 @@
-mode: "HTTP"
-http:
-  host: "0.0.0.0"
-  port: 9102
-  authentication:
-    scheme: "NONE"
-    username: "username"
-    password: "password"
-pushGateway:
-  job: "unifiedmetrics"
-  url: "http://pushgateway:9091"
-  authentication:
-    scheme: "NONE"
-    username: "username"
-    password: "password"
-  interval: 10
--- a/src/plugins/ViaVersion/config.yml
+++ b/src/plugins/ViaVersion/config.yml
@ -41,7 +41,7 @@ suppress-text-component-conversion-warnings: true
 #
 # What is the maximum per second a client can send (Use %pps to display their pps)
 # Use -1 to disable.
-max-pps: -1
+max-pps: 800
 max-pps-kick-msg: You are sending too many packets!
 #
 # We can also kick them if over a period they send over a threshold a certain amount of times.
--- a/src/plugins/unifiedmetrics-platform-bukkit-0.3.8.jar
+++ b/src/plugins/unifiedmetrics-platform-bukkit-0.3.8.jar
--- a/src/purpur.yml
+++ b/src/purpur.yml
@ -1635,7 +1635,7 @@ world-settings:
        place-with-arms-visible: false
      arrow:
        movement-resets-despawn-counter: true
-      use-better-mending: true
+      use-better-mending: false
      always-tame-in-creative: false
      boat:
        eject-players-on-land: false
--- a/src/server.properties
+++ b/src/server.properties
@ -7,7 +7,7 @@ broadcast-console-to-ops=true
 broadcast-rcon-to-ops=true
 bug-report-link=
 debug=false
-difficulty=hard
+difficulty=easy
 enable-command-block=false
 enable-jmx-monitoring=false
 enable-query=false
@ -22,7 +22,7 @@ gamemode=survival
 generate-structures=true
 generator-settings={}
 hardcore=false
-hide-online-players=true
+hide-online-players=false
 initial-disabled-packs=
 initial-enabled-packs=vanilla
 level-name=world
@ -30,7 +30,7 @@ level-seed=
 level-type=minecraft\:normal
 log-ips=true
 max-chained-neighbor-updates=1000000
-max-players=50
+max-players=20
 max-tick-time=60000
 max-world-size=29999984
 motd=A Minecraft Server
@ -53,13 +53,13 @@ resource-pack-sha1=
 server-ip=
 server-name=Unknown Server
 server-port=25565
-simulation-distance=8
+simulation-distance=10
 spawn-animals=true
 spawn-monsters=true
 spawn-npcs=true
-spawn-protection=0
+spawn-protection=16
 sync-chunk-writes=true
 text-filtering-config=
 use-native-transport=true
-view-distance=8
+view-distance=10
 white-list=false
--- a/src/spigot.yml
+++ b/src/spigot.yml
@ -21,7 +21,7 @@ settings:
  bungeecord: false
  save-user-cache-on-stop-only: false
  sample-count: 12
-  player-shuffle: 20
+  player-shuffle: 0
  user-cache-size: 1000
  moved-wrongly-threshold: 0.0625
  moved-too-quickly-multiplier: 10.0
@ -65,7 +65,7 @@ world-settings:
    thunder-chance: 100000
    merge-radius:
      item: 0.5
-      exp: 0.5
+      exp: -1.0
    mob-spawn-range: 8
    item-despawn-rate: 6000
    arrow-despawn-rate: 1200
@ -101,13 +101,13 @@ world-settings:
      glowberry-modifier: 100
      pitcherplant-modifier: 100
    entity-activation-range:
-      animals: 0
-      monsters: 0
-      raiders: 0
-      misc: 0
-      water: 0
-      villagers: 0
-      flying-monsters: 0
+      animals: 32
+      monsters: 32
+      raiders: 64
+      misc: 16
+      water: 16
+      villagers: 32
+      flying-monsters: 32
      wake-up-inactive:
        animals-max-per-tick: 4
        animals-every: 1200
@ -168,7 +168,7 @@ world-settings:
      swim-multiplier: 0.01
      sprint-multiplier: 0.1
      other-multiplier: 0.0
-    max-tnt-per-tick: 0
+    max-tnt-per-tick: 100
    max-tick-time:
      tile: 50
      entity: 50