From d2fea1d669b898b3972cf3a183f567da79d399d0 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 24 Jun 2023 14:14:23 -0300 Subject: [PATCH 1/5] General config fixup --- bukkit.yml | 6 +- commands.yml | 8 +-- config/paper-global.yml | 19 +++++- config/paper-world-defaults.yml | 29 ++++++--- config/scissors.yml | 6 +- server.properties | 100 ++++++++++++++++---------------- spigot.yml | 28 +++++++-- 7 files changed, 125 insertions(+), 71 deletions(-) diff --git a/bukkit.yml b/bukkit.yml index 37ae2ca..c296695 100644 --- a/bukkit.yml +++ b/bukkit.yml @@ -2,10 +2,10 @@ # As you can see, there's actually not that much to configure without any plugins. # For a reference for any variable inside this file, check out the Bukkit Wiki at # https://www.spigotmc.org/go/bukkit-yml -# +# # If you need help on this file, feel free to join us on irc or leave a message # on the forums asking for advice. -# +# # IRC: #spigot @ irc.spi.gt # (If this means nothing to you, just go to https://www.spigotmc.org/go/irc ) # Forums: https://www.spigotmc.org/ @@ -37,6 +37,8 @@ chunk-gc: load-threshold: 200 period-in-ticks: 200 ticks-per: + water-underground-creature-spawns: 100 + axolotl-spawns: 100 water-spawns: 100 water-ambient-spawns: 100 ambient-spawns: 100 diff --git a/commands.yml b/commands.yml index 5278dc4..09c66a4 100644 --- a/commands.yml +++ b/commands.yml @@ -1,10 +1,10 @@ # This is the commands configuration file for Bukkit. # For documentation on how to make use of this file, check out the Bukkit Wiki at # https://www.spigotmc.org/go/commands-yml -# +# # If you need help on this file, feel free to join us on irc or leave a message # on the forums asking for advice. -# +# # IRC: #spigot @ irc.spi.gt # (If this means nothing to you, just go to https://www.spigotmc.org/go/irc ) # Forums: https://www.spigotmc.org/ @@ -52,12 +52,12 @@ aliases: - [] essentials:memo: - [] - + paper: - [] paper:paper: - [] - + icanhasbukkit: - version $1- ban: diff --git a/config/paper-global.yml b/config/paper-global.yml index 3038fb9..3943795 100644 --- a/config/paper-global.yml +++ b/config/paper-global.yml @@ -13,8 +13,6 @@ # Website: https://papermc.io/ _version: 28 -async-chunks: - threads: -1 chunk-loading: autoconfig-send-distance: true enable-frustum-priority: false @@ -26,6 +24,18 @@ chunk-loading: player-max-chunk-load-rate: -1.0 player-max-concurrent-loads: 20.0 target-player-chunk-send-rate: 100.0 +chunk-loading-advanced: + auto-config-send-distance: true + player-max-concurrent-chunk-generates: 0 + player-max-concurrent-chunk-loads: 0 +chunk-loading-basic: + player-max-chunk-generate-rate: -1.0 + player-max-chunk-load-rate: 100.0 + player-max-chunk-send-rate: 75.0 +chunk-system: + gen-parallelism: enabled + io-threads: -1 + worker-threads: -1 collisions: enable-player-collisions: true send-full-pos-for-hard-colliding-entities: true @@ -51,7 +61,6 @@ item-validation: logging: deobfuscate-stacktraces: true log-player-ip-addresses: true - use-rgb-for-named-text-colors: true messages: kick: authentication-servers-down: @@ -62,6 +71,9 @@ messages: Please contact the server administrators if you believe that this is in error. use-display-name-in-quit-message: false misc: + chat-threads: + chat-executor-core-size: -1 + chat-executor-max-size: -1 fix-entity-position-desync: true lag-compensate-block-breaking: true load-permissions-yml-before-plugins: true @@ -113,6 +125,7 @@ timings: url: https://timings.aikar.co/ verbose: true unsupported-settings: + allow-grindstone-overstacking: false allow-headless-pistons: true allow-permanent-block-break-exploits: true allow-piston-duplication: true diff --git a/config/paper-world-defaults.yml b/config/paper-world-defaults.yml index d746b23..2ecba3e 100644 --- a/config/paper-world-defaults.yml +++ b/config/paper-world-defaults.yml @@ -12,7 +12,7 @@ # Discord: https://discord.gg/papermc # Website: https://papermc.io/ -_version: 28 +_version: 30 anticheat: anti-xray: enabled: false @@ -51,6 +51,7 @@ anticheat: items: hide-durability: false hide-itemmeta: false + hide-itemmeta-with-visual-effects: false chunks: auto-save-interval: default delay-chunk-unloads-by: 10s @@ -62,6 +63,7 @@ chunks: small_fireball: -1 snowball: -1 fixed-chunk-inhabited-time: -1 + flush-regions-on-save: false max-auto-save-chunks-per-tick: 6 prevent-moving-into-unloaded-chunks: true collisions: @@ -72,9 +74,10 @@ collisions: only-players-collide: false entities: armor-stands: - do-collision-entity-lookups: true + do-collision-entity-lookups: false tick: true behavior: + allow-spider-world-border-climbing: true baby-zombie-movement-modifier: 0.5 disable-chest-cat-detection: true disable-creeper-lingering-effect: false @@ -100,6 +103,8 @@ entities: parrots-are-unaffected-by-player-movement: false phantoms-do-not-spawn-on-creative-players: true phantoms-only-attack-insomniacs: true + phantoms-spawn-attempt-max-seconds: 119 + phantoms-spawn-attempt-min-seconds: 60 piglins-guard-chests: true pillager-patrols: disable: false @@ -110,11 +115,14 @@ entities: start: day: 5 per-player: false + player-insomnia-start-ticks: 72000 should-remove-dragon: false spawner-nerfed-mobs-should-jump: false zombie-villager-infection-chance: -1.0 zombies-target-turtle-eggs: false entities-target-with-follow-range: false + markers: + tick: false mob-effects: immune-to-wither-effect: wither: true @@ -158,7 +166,13 @@ entities: duplicate-uuid: mode: SAFE_REGEN safe-regen-delete-range: 32 - filter-nbt-data-from-spawn-eggs-and-related: false + filter-bad-tile-entity-nbt-from-falling-blocks: false + filtered-entity-tag-nbt-paths: + - Pos + - Motion + - SleepingX + - SleepingY + - SleepingZ iron-golems-can-spawn-in-air: false monster-spawn-max-light-level: -1 non-player-arrow-despawn-rate: default @@ -193,13 +207,14 @@ environment: disable-ice-and-snow: false disable-teleportation-suffocation-check: false disable-thunder: false + fire-tick-delay: 30 frosted-ice: delay: max: 40 min: 20 enabled: true generate-flat-bedrock: false - nether-ceiling-void-damage-height: 0 + nether-ceiling-void-damage-height: disabled optimize-explosions: true portal-create-radius: 16 portal-search-radius: 16 @@ -217,12 +232,12 @@ fishing-time-range: minimum: 100 fixes: disable-unloaded-chunk-enderpearl-exploit: true - falling-block-height-nerf: 0 + falling-block-height-nerf: disabled fix-curing-zombie-villager-discount-exploit: true fix-items-merging-through-walls: false prevent-tnt-from-moving-in-water: false split-overstacked-loot: true - tnt-entity-height-nerf: 0 + tnt-entity-height-nerf: disabled hopper: cooldown-when-full: true disable-move-event: true @@ -244,7 +259,7 @@ max-growth-height: cactus: 3 reeds: 3 misc: - disable-end-credits: false + disable-end-credits: true disable-relative-projectile-velocity: false disable-sprint-interruption-on-attack: false light-queue-size: 20 diff --git a/config/scissors.yml b/config/scissors.yml index c4079c8..643138c 100644 --- a/config/scissors.yml +++ b/config/scissors.yml @@ -7,9 +7,11 @@ # # Discord: https://discord.com/invite/mtVQcHn58h # Website: https://scissors.gg/ -# Docs: https://scissors.gg/javadoc/1.19/ +# Docs: https://javadoc.scissors.gg/1.20.1/ +excludePlayersFromNbtComponents: false +componentDepthLimit: 128 chatSignaturesEnabled: false commandSignsBypassPermissions: false runCommandsInBooks: true -config-version: 3 +config-version: 5 diff --git a/server.properties b/server.properties index c4481c5..e9e1376 100644 --- a/server.properties +++ b/server.properties @@ -1,57 +1,59 @@ #Minecraft server properties -allow-flight=true -allow-nether=true -broadcast-console-to-ops=true -broadcast-rcon-to-ops=true -debug=false -difficulty=easy -enable-command-block=true enable-jmx-monitoring=false -enable-query=true -enable-rcon=false -enable-status=true -enforce-secure-profile=false -enforce-whitelist=false -entity-broadcast-range-percentage=100 -force-gamemode=false -function-permission-level=2 -gamemode=creative -generate-structures=true -generator-settings={} -hardcore=false -hide-online-players=false -level-name=world level-seed= -level-type=minecraft\:normal -max-chained-neighbor-updates=1000000 -max-players=0 -max-tick-time=60000 -max-world-size=29999984 -motd=\u00A78\u00A7l Welcome to Kaboom\!\n > \u00A77Free OP - Anarchy - Creative -network-compression-threshold=256 -online-mode=false -op-permission-level=4 -player-idle-timeout=0 -prevent-proxy-connections=false -previews-chat=false -pvp=true -query.port=25565 -rate-limit=0 -rcon.password= rcon.port=25575 +enable-command-block=true +gamemode=creative +enable-query=true +generator-settings={} +enforce-secure-profile=false +level-name=world +motd=§8§l Welcome to Kaboom\!\n > §7Free OP - Anarchy - Creative +query.port=25565 +pvp=true +generate-structures=true +max-chained-neighbor-updates=200 +difficulty=easy +network-compression-threshold=512 +max-tick-time=30000 require-resource-pack=false -resource-pack= -resource-pack-prompt= -resource-pack-sha1= -server-ip= -server-port=25565 -simulation-distance=5 -spawn-animals=true -spawn-monsters=true -spawn-npcs=true -spawn-protection=0 -sync-chunk-writes=false -text-filtering-config= +max-players=0 use-native-transport=true +enable-status=true +online-mode=false +allow-flight=true +initial-disabled-packs= +broadcast-rcon-to-ops=true view-distance=5 +resource-pack-prompt= +server-ip= +allow-nether=true +server-port=25565 +enable-rcon=false +sync-chunk-writes=false +op-permission-level=4 +prevent-proxy-connections=false +hide-online-players=false +resource-pack= +entity-broadcast-range-percentage=100 +simulation-distance=5 +player-idle-timeout=0 +rcon.password= +debug=false +force-gamemode=false +rate-limit=0 +hardcore=false white-list=false +broadcast-console-to-ops=true +previews-chat=false +spawn-npcs=true +spawn-animals=true +function-permission-level=2 +initial-enabled-packs=vanilla +level-type=minecraft\:normal +text-filtering-config= +spawn-monsters=true +enforce-whitelist=false +resource-pack-sha1= +spawn-protection=0 +max-world-size=29999984 diff --git a/spigot.yml b/spigot.yml index 72714e1..6fb28a6 100644 --- a/spigot.yml +++ b/spigot.yml @@ -3,11 +3,11 @@ # with caution, and make sure you know what each option does before configuring. # For a reference for any variable inside this file, check out the Spigot wiki at # http://www.spigotmc.org/wiki/spigot-configuration/ -# +# # If you need help with the configuration or have any questions related to Spigot, -# join us at the IRC or drop by our forums and leave a post. -# -# IRC: #spigot @ irc.spi.gt ( http://www.spigotmc.org/pages/irc/ ) +# join us at the Discord or drop by our forums and leave a post. +# +# Discord: https://www.spigotmc.org/go/discord # Forums: http://www.spigotmc.org/ config-version: 12 @@ -63,6 +63,16 @@ advancements: - '*' world-settings: default: + below-zero-generation-in-existing-chunks: true + simulation-distance: default + thunder-chance: 100000 + hopper-can-load-chunks: false + seed-nether: 30084232 + seed-ancientcity: 20083232 + seed-trailruins: 83469867 + seed-buriedtreasure: 10387320 + seed-mineshaft: default + seed-stronghold: default seed-bastion: 30084232 seed-fortress: 30084232 seed-mansion: 10387319 @@ -96,6 +106,12 @@ world-settings: hanging-tick-frequency: 100 max-entity-collisions: 1 growth: + torchflower-modifier: 100 + twistingvines-modifier: 100 + weepingvines-modifier: 100 + cavevines-modifier: 100 + glowberry-modifier: 100 + pitcherplant-modifier: 100 cactus-modifier: 100 cane-modifier: 100 melon-modifier: 100 @@ -116,6 +132,7 @@ world-settings: item: 2.5 exp: 3.0 entity-activation-range: + ignore-spectators: false animals: 16 monsters: 24 raiders: 32 @@ -141,6 +158,7 @@ world-settings: flying-monsters-every: 200 flying-monsters-for: 100 entity-tracking-range: + display: 128 players: 48 animals: 48 monsters: 48 @@ -162,3 +180,5 @@ world-settings: entity: 20 squid-spawn-range: min: 45.0 + faweregentempworld: + verbose: false From 8a9eaef86b6f26388fbb635fe212368143d6f4b3 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 24 Jun 2023 14:23:06 -0300 Subject: [PATCH 2/5] Update gitignore --- .gitignore | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 247d851..84657f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,26 @@ -fetched_*/ -scripts/fetched_*/ +/fetched_*/ +/scripts/fetched_*/ + +# Server files +cache/ +/libraries/ +/logs/ +/plugins/Essentials/userdata +/plugins/Essentials/warps/* +/plugins/Essentials/custom_items.yml +/plugins/Essentials/items.json +/plugins/Essentials/kits.yml +/plugins/Essentials/usermap.bin +/plugins/Essentials/uuids.bin +/plugins/Essentials/worth.yml +/plugins/FastAsyncWorldEdit/lang/ +/plugins/Geyser-Spigot/locales/ +/versions/ +/worlds/ +/banned-ips.json +/banned-players.json +/help.yml +/ops.json +/usercache.json +/version_history.json +/whitelist.json From 43b2b2b18e23e2ec581e69e908d5966bdb2046af Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 24 Jun 2023 14:23:14 -0300 Subject: [PATCH 3/5] Sync plugin config --- plugins/Essentials/upgrades-done.yml | 1 + plugins/FastAsyncWorldEdit/config.yml | 45 +++++++++++---- plugins/ViaBackwards/config.yml | 24 ++++++-- plugins/ViaRewind/config.yml | 22 +++++--- plugins/ViaVersion/config.yml | 81 ++++++++++++++++++--------- plugins/bStats/config.yml | 2 + 6 files changed, 123 insertions(+), 52 deletions(-) diff --git a/plugins/Essentials/upgrades-done.yml b/plugins/Essentials/upgrades-done.yml index e9332f2..e06bc00 100644 --- a/plugins/Essentials/upgrades-done.yml +++ b/plugins/Essentials/upgrades-done.yml @@ -15,3 +15,4 @@ updateUsersIgnoreListUUID: true updateUsersStupidLegacyPathNames: true updateUsersMailList: true updatePurgeBrokenNpcAccounts: true +newUidCacheBuilt: true diff --git a/plugins/FastAsyncWorldEdit/config.yml b/plugins/FastAsyncWorldEdit/config.yml index ccbff41..2aea860 100644 --- a/plugins/FastAsyncWorldEdit/config.yml +++ b/plugins/FastAsyncWorldEdit/config.yml @@ -1,9 +1,9 @@ # These first 6 aren't configurable issues: "https://github.com/IntellectualSites/FastAsyncWorldEdit/issues" wiki: "https://intellectualsites.github.io/fastasyncworldedit-documentation/" -date: "Fri May 06 00:00:00 EEST 2022" -build: "https://ci.athion.net/job/FastAsyncWorldEdit/151" -commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/fdb7c154" +date: "Sun Jul 23 00:00:00 BRT 2023" +build: "https://ci.athion.net/job/FastAsyncWorldEdit/494" +commit: "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/ffa2a52f" platform: "Bukkit" # Set true to enable WorldEdit restrictions per region (e.g. PlotSquared or WorldGuard). # To be allowed to WorldEdit in a region, users need the appropriate @@ -39,6 +39,9 @@ clipboard: delete-after-days: 1 # If a player's clipboard should be deleted upon logout delete-on-logout: false + # Allows NBT stored in a clipboard to be written to disk + # - Requires clipboard.use-disk to be enabled + save-clipboard-nbt-to-disk: false lighting: # If packet sending should be delayed until relight is finished @@ -64,17 +67,25 @@ tick-limiter: physics-ms: 10 # Max item spawns per interval (per chunk) items: 20 - # Whether fireworks can load chunks - # - Fireworks usually travel vertically so do not load any chunks - # - Horizontal fireworks can be hacked in to crash a server - fireworks-load-chunks: false +# Web/HTTP connection related settings web: # The web interface for clipboards # - All schematics are anonymous and private # - Downloads can be deleted by the user # - Supports clipboard uploads, downloads and saves url: "https://schem.intellectualsites.com/fawe/" + # The maximum amount of time in seconds the plugin can attempt to load images for. + max-image-load-time: 5 + # The maximum size (width x length) an image being loaded can be. + # - 8294400 is 3840x2160 + max-image-size: 8294400 + # Whitelist of hostnames to allow images to be downloaded from + # - Adding '*' to the list will allow any host, but this is NOT adviseable + # - Crash exploits exist with malformed images + # - See: https://medium.com/chargebee-engineering/perils-of-parsing-pixel-flood-attack-on-java-imageio-a97aeb06637d + allowed-image-hosts: + - "i.imgur.com" extent: # Don't bug console when these plugins slow down WorldEdit operations @@ -101,6 +112,12 @@ experimental: # [SAFE] Keep entities that are positioned in non-air blocks when editing an area # Might cause client-side FPS lag in some situations keep-entities-in-blocks: false + # [SAFE] Attempt to remove entities from the world if they were not present in the expected chunk (default: true) + # - Sometimes an entity may have moved into a different chunk to that which FAWE expected + # - This option allows FAWE to attempt to remove the entity, even if present in a different chunk + # - If the entity is in an unloaded or partially loaded chunk, this will fail + # - If an entity cannot be removed, it is possible duplicate entities may be created when using undo and/or redo + remove-entity-from-world-on-chunk-fail: true # Other experimental features other: false # Allow fluids placed by FAWE to tick (flow). This could cause the big lags. @@ -133,7 +150,8 @@ queue: # - A larger value will use slightly less CPU time # - A smaller value will reduce memory usage # - A value too small may break some operations (deform?) - # - Values smaller than the configurated parallel threads are not accepted + # - Values smaller than the configurated parallel-threads are not accepted + # - It is recommended this option be at least 4x greater than parallel-threads target-size: 64 # Force FAWE to start placing chunks regardless of whether an edit is finished processing # - A larger value will use slightly less CPU time @@ -269,6 +287,10 @@ region-restrictions-options: # - Will still search for current allowed regions to limit the edit to. # - Any blacklist regions are likely to override any internal allowed regions. worldguard-region-blacklist: false + # Restrict all edits to within the safe chunk limits of +/- 30 million blocks + # - Edits outside this range may induce crashing + # - Forcefully prevents any edit outside this range + restrict-to-safe-range: true # The "default" limit group affects those without a specific limit permission. # To grant someone different limits, copy the default limits group # and give it a different name (e.g. newbie). Then give the user the limit @@ -322,14 +344,15 @@ limits: # - If fast-placement is disabled, this may cause edits to be slower. universal-disallowed-blocks: true # List of blocks to deny use of. Can be either an entire block type or a block with a specific property value. - # Where block properties are specified, any blockstate with the property will be disallowed (i.g. all directions - # of a waterlogged fence). For blocking/remapping of all occurence of a property like waterlogged, see + # Where block properties are specified, any blockstate with the property will be disallowed (e.g. all directions + # of a waterlogged fence). For blocking/remapping of all occurrences of a property like waterlogged, see # remap-properties below. + # To generate a blank list, substitute the default content with a set of square brackets [] instead. # Example block property blocking: # - "minecraft:conduit[waterlogged=true]" # - "minecraft:piston[extended=false,facing=west]" # - "minecraft:wheat[age=7]" - disallowed-blocks: + disallowed-blocks: [] # List of block properties that should be remapped if used in an edit. Entries should take the form # "property_name[value1_old:value1_new,value2_old:value2_new]". For example: # - "waterlogged[true:false]" diff --git a/plugins/ViaBackwards/config.yml b/plugins/ViaBackwards/config.yml index 9b992eb..f451d9c 100644 --- a/plugins/ViaBackwards/config.yml +++ b/plugins/ViaBackwards/config.yml @@ -1,18 +1,32 @@ # If you need help, you can join our Discord - https://viaversion.com/discord -# +# # Always shows a mapped mob's original name, and not only when hovering over it with the cursor. always-show-original-mob-name: true -# +# # Writes name and level of custom enchantments into the item's lore. # Set this to false if you see the entries doubled/if the custom-enchant plugin already writes these into the lore manually. add-custom-enchants-into-lore: true -# +# # Adds the color of a scoreboard team after its prefix for 1.12 clients on 1.13+ servers. add-teamcolor-to-prefix: true -# +# # Converts the 1.13 face look-at packet for 1.12- players. Requires a bit of extra caching. fix-1_13-face-player: false -# +# +# Fixes 1.13 clients and lower not seeing color or formatting in inventory titles by converting them to legacy text. +# If you have issues with translatable text being displayed wrongly, disable this. +fix-formatted-inventory-titles: true +# # Sends inventory acknowledgement packets to act as a replacement for ping packets for sub 1.17 clients. # This only takes effect for ids in the short range. Useful for anticheat compatibility. handle-pings-as-inv-acknowledgements: false +# +# 1.19.1 chat type formats. +chat-types-1_19_1: + chat.type.text: <%s> %s + chat.type.announcement: '[%s] %s' + commands.message.display.incoming: '%s whispers to you: %s' + commands.message.display.outgoing: 'You whisper to %s: %s' + chat.type.team.text: '%s <%s> %s' + chat.type.team.sent: -> %s <%s> %s + chat.type.emote: '* %s %s' diff --git a/plugins/ViaRewind/config.yml b/plugins/ViaRewind/config.yml index 715ac36..52d72b6 100644 --- a/plugins/ViaRewind/config.yml +++ b/plugins/ViaRewind/config.yml @@ -1,12 +1,16 @@ -# Specifies how 1.8.x clients should see the cooldown indicator -# You can choose between TITLE, ACTION_BAR, BOSS_BAR and DISABLED -# ONLY DISABLE IF YOU HAVE 1.9 COOLDOWN DISABLED ON YOUR SERVER -# 1.8 PLAYERS MAY ASK WHY PVP IS NOT WORKING OTHERWISE +#Specifies how 1.8.x clients should see the cooldown indicator +#You can choose between TITLE, ACTION_BAR, BOSS_BAR and DISABLED +#ONLY DISABLE IF YOU HAVE 1.9 COOLDOWN DISABLED ON YOUR SERVER +#1.8 PLAYERS MAY ASK WHY PVP IS NOT WORKING OTHERWISE cooldown-indicator: TITLE -# Replaces Adventure mode with Survival mode for 1.7.x clients -# Enable this option if your server is using the 'CanDestroy' -# or 'CanPlaceOn' flags on items +#Replaces Adventure mode with Survival mode for 1.7.x clients +#Enable this option if your server is using the 'CanDestroy' +#or 'CanPlaceOn' flags on items replace-adventure: false -# Whether 1.9 particles should be replaced by similar ones in -# 1.8 and lower +#Whether 1.9 particles should be replaced by similar ones in +#1.8 and lower replace-particles: false +#Max amount of pages for written books before a client gets kicked +max-book-pages: 100 +#Max amount of characters in the json (!) string of a book page before a client gets kicked +max-book-page-length: 5000 diff --git a/plugins/ViaVersion/config.yml b/plugins/ViaVersion/config.yml index e531755..68ff2d9 100644 --- a/plugins/ViaVersion/config.yml +++ b/plugins/ViaVersion/config.yml @@ -4,17 +4,21 @@ # Discord - https://viaversion.com/discord # viaversion.com - Discussion tab # Docs - https://docs.viaversion.com/display/VIAVERSION/Configuration -# -# ----------------------------------------------------------# +# +#----------------------------------------------------------# # GLOBAL OPTIONS # -# ----------------------------------------------------------# -# +#----------------------------------------------------------# +# # Should ViaVersion check for updates? checkforupdates: false # Send the supported versions with the Status (Ping) response packet send-supported-versions: false -# Block specific Minecraft protocols that ViaVersion allows -# List of all Minecraft protocol versions: http://wiki.vg/Protocol_version_numbers or use a generator: https://via.krusic22.com +# Easier to configure alternative to 'block-protocols'. Uses readable version strings with possible '<' and '>' prefixes. +# An example to block 1.16.4, everything below 1.16, as well as everything above 1.17.1 would be: ["<1.16", "1.16.4", ">1.17.1"] +# You can use both this and the block-protocols option at the same time as well. +block-versions: [] +# Block specific Minecraft protocol version numbers. +# List of all Minecraft protocol versions: http://wiki.vg/Protocol_version_numbers, or use a generator: https://via.krusic22.com block-protocols: [] # Change the blocked disconnect message block-disconnect-msg: You are using an unsupported Minecraft version! @@ -24,22 +28,22 @@ block-disconnect-msg: You are using an unsupported Minecraft version! reload-disconnect-msg: Server reload, please rejoin! # We warn when there's a error converting item and block data over versions, should we suppress these? (Only suggested if spamming) suppress-conversion-warnings: true -# -# ----------------------------------------------------------# +# +#----------------------------------------------------------# # GLOBAL PACKET LIMITER # -# ----------------------------------------------------------# -# -# +#----------------------------------------------------------# +# THIS FEATURE IS DISABLED ON 1.17.1+ PAPER SERVERS, SINCE IT HAS A BETTER PACKET-LIMITER INBUILT +# # Packets Per Second (PPS) limiter (Use -1 on max-pps and tracking-period to disable) # Clients by default send around 20-90 packets per second. -# +# # 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-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. -# +# # Period to track (in seconds) # Use -1 to disable. tracking-period: -1 @@ -49,11 +53,14 @@ tracking-warning-pps: 120 # This can never be higher than "tracking-period" tracking-max-warnings: 4 tracking-max-kick-msg: You are sending too many packets, :( -# -# ----------------------------------------------------------# +# +#----------------------------------------------------------# # MULTIPLE VERSIONS OPTIONS # -# ----------------------------------------------------------# -# +#----------------------------------------------------------# +# +# Whether to make sure ViaVersion's UserConnection object is already available in the PlayerJoinEvent. +# You may disable this for faster startup/join time if you are 100% sure no plugin requires this. +register-userconnections-on-join: true # Should we enable our hologram patch? # If they're in the wrong place enable this hologram-patch: false @@ -90,7 +97,7 @@ fix-non-full-blocklight: true fix-1_14-health-nan: true # Should 1.15+ clients respawn instantly / without showing a death screen? use-1_15-instant-respawn: true -# +# # Enable serverside block-connections for 1.13+ clients - all of the options in this section are built around this option serverside-blockconnections: false # Sets the method for the block connections (world for highly experimental (USE AT OWN RISK) world-level or packet for packet-level) @@ -102,20 +109,35 @@ reduce-blockstorage-memory: true flowerstem-when-block-above: false # Vines that are not connected to blocks will be mapped to air, else 1.13+ would still be able to climb up on them. vine-climb-fix: false -# +# # Ignores incoming plugin channel messages of 1.16+ clients with channel names longer than 32 characters. # CraftBukkit had this limit hardcoded until 1.16, so we have to assume any server/proxy might have this arbitrary check present. ignore-long-1_16-channel-names: true -# +# # Force 1.17+ client to accept the server resource pack; they will automatically disconnect if they decline. forced-use-1_17-resource-pack: false # The message to be displayed at the prompt when the 1.17+ client receives the server resource pack. resource-pack-1_17-prompt: '' -# -# ----------------------------------------------------------# +# +# Caches light until chunks are unloaded to allow subsequent chunk update packets as opposed to instantly uncaching when the first chunk data is sent. +# Only disable this if you know what you are doing. +cache-1_17-light: true +# +# 1.19 chat type formats used for 1.19.1+ clients. +chat-types-1_19: + chat.type.text: <%s> %s + chat.type.announcement: '[%s] %s' + commands.message.display.incoming: '%s whispers to you: %s' + chat.type.team.text: '%s <%s> %s' + chat.type.emote: '* %s %s' +# +# Force-update 1.19.4+ player's inventory when they try to swap armor in a pre-occupied slot. +armor-toggle-fix: true +# +#----------------------------------------------------------# # 1.9+ CLIENTS ON 1.8 SERVERS OPTIONS # -# ----------------------------------------------------------# -# +#----------------------------------------------------------# +# # No collide options, these allow you to configure how collision works. # Do you want us to prevent collision? prevent-collision: false @@ -147,15 +169,20 @@ use-new-effect-indicator: false use-new-deathmessages: false # Should we cache our items, this will prevent server from being lagged out, however the cost is a constant task caching items item-cache: false -# Patch the anti xray to work on 1.9+ (If your server is 1.8) This can cost more performance, so disable it if you don't use it. -anti-xray-patch: false # Should we replace extended pistons to fix 1.10.1 (Only on chunk load) replace-pistons: false # What id should we replace with, default is air. (careful of players getting stuck standing on them) replacement-piston-id: 0 +# Fix 1.9+ clients not rendering the far away chunks and improve chunk rendering when moving fast (Increases network usage and decreases client fps slightly) +chunk-border-fix: false # Force the string -> json transform force-json-transform: false # Minimize the cooldown animation in 1.8 servers minimize-cooldown: false # Allows 1.9+ left-handedness (main hand) on 1.8 servers left-handed-handling: false +# Get the world names which should be returned for each vanilla dimension +map-1_16-world-names: + overworld: minecraft:overworld + nether: minecraft:the_nether + end: minecraft:the_end diff --git a/plugins/bStats/config.yml b/plugins/bStats/config.yml index 1c2bac1..ec298cc 100644 --- a/plugins/bStats/config.yml +++ b/plugins/bStats/config.yml @@ -2,5 +2,7 @@ # To honor their work, you should not disable it. # This has nearly no effect on the server performance! # Check out https://bStats.org/ to learn more :) + enabled: false logFailedRequests: false +serverUuid: 00000000-0000-0000-0000-000000000000 From e5b237dae8aaf5b55e9fe905b25b15eea716c5aa Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 24 Jun 2023 14:47:05 -0300 Subject: [PATCH 4/5] Add command block packet limit --- config/paper-global.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/paper-global.yml b/config/paper-global.yml index 3943795..926d239 100644 --- a/config/paper-global.yml +++ b/config/paper-global.yml @@ -93,6 +93,22 @@ packet-limiter: action: DROP interval: 4.0 max-packet-rate: 5.0 + ServerboundSetCommandBlockPacket: + action: DROP + interval: 1.0 + max-packet-rate: 51.0 + ServerboundSetCommandMinecartPacket: + action: DROP + interval: 1.0 + max-packet-rate: 51.0 + ServerboundSetJigsawBlockPacket: + action: DROP + interval: 1.0 + max-packet-rate: 51.0 + ServerboundSetStructureBlockPacket: + action: DROP + interval: 1.0 + max-packet-rate: 51.0 player-auto-save: max-per-tick: -1 rate: -1 From e5ba729e05180c8b918a5fea59ae4a06b3662a6a Mon Sep 17 00:00:00 2001 From: Luna <90072930+LunaWasFlaggedAgain@users.noreply.github.com> Date: Sat, 24 Jun 2023 21:02:14 -0300 Subject: [PATCH 5/5] Raise limits --- config/paper-global.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/paper-global.yml b/config/paper-global.yml index 926d239..55527f3 100644 --- a/config/paper-global.yml +++ b/config/paper-global.yml @@ -96,19 +96,19 @@ packet-limiter: ServerboundSetCommandBlockPacket: action: DROP interval: 1.0 - max-packet-rate: 51.0 + max-packet-rate: 101.0 ServerboundSetCommandMinecartPacket: action: DROP interval: 1.0 - max-packet-rate: 51.0 + max-packet-rate: 101.0 ServerboundSetJigsawBlockPacket: action: DROP interval: 1.0 - max-packet-rate: 51.0 + max-packet-rate: 101.0 ServerboundSetStructureBlockPacket: action: DROP interval: 1.0 - max-packet-rate: 51.0 + max-packet-rate: 101.0 player-auto-save: max-per-tick: -1 rate: -1