diff --git a/EstiNet/data/EndCity_index.dat b/EstiNet/data/EndCity_index.dat new file mode 100644 index 0000000..388edd5 Binary files /dev/null and b/EstiNet/data/EndCity_index.dat differ diff --git a/EstiNet/data/Fortress_index.dat b/EstiNet/data/Fortress_index.dat new file mode 100644 index 0000000..388edd5 Binary files /dev/null and b/EstiNet/data/Fortress_index.dat differ diff --git a/EstiNet/data/Mansion_index.dat b/EstiNet/data/Mansion_index.dat new file mode 100644 index 0000000..388edd5 Binary files /dev/null and b/EstiNet/data/Mansion_index.dat differ diff --git a/EstiNet/data/Mineshaft_index.dat b/EstiNet/data/Mineshaft_index.dat new file mode 100644 index 0000000..388edd5 Binary files /dev/null and b/EstiNet/data/Mineshaft_index.dat differ diff --git a/EstiNet/data/Monument_index.dat b/EstiNet/data/Monument_index.dat new file mode 100644 index 0000000..388edd5 Binary files /dev/null and b/EstiNet/data/Monument_index.dat differ diff --git a/EstiNet/data/Stronghold_index.dat b/EstiNet/data/Stronghold_index.dat new file mode 100644 index 0000000..388edd5 Binary files /dev/null and b/EstiNet/data/Stronghold_index.dat differ diff --git a/EstiNet/data/Temple_index.dat b/EstiNet/data/Temple_index.dat new file mode 100644 index 0000000..388edd5 Binary files /dev/null and b/EstiNet/data/Temple_index.dat differ diff --git a/EstiNet/data/Village_index.dat b/EstiNet/data/Village_index.dat new file mode 100644 index 0000000..8eb0c8d Binary files /dev/null and b/EstiNet/data/Village_index.dat differ diff --git a/EstiNet/data/villages.dat b/EstiNet/data/villages.dat index e10e4a7..25eb1c3 100644 Binary files a/EstiNet/data/villages.dat and b/EstiNet/data/villages.dat differ diff --git a/EstiNet/datapacks/bukkit/pack.mcmeta b/EstiNet/datapacks/bukkit/pack.mcmeta new file mode 100644 index 0000000..76afe9d --- /dev/null +++ b/EstiNet/datapacks/bukkit/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Data pack for resources provided by Bukkit plugins", + "pack_format": 1 + } +} \ No newline at end of file diff --git a/EstiNet/level.dat b/EstiNet/level.dat index c459536..c303c84 100644 Binary files a/EstiNet/level.dat and b/EstiNet/level.dat differ diff --git a/EstiNet/level.dat_old b/EstiNet/level.dat_old index 9f2c71c..328de30 100644 Binary files a/EstiNet/level.dat_old and b/EstiNet/level.dat_old differ diff --git a/EstiNet/region/r.-1.-1.mca b/EstiNet/region/r.-1.-1.mca index 4ec928e..2885e3d 100644 Binary files a/EstiNet/region/r.-1.-1.mca and b/EstiNet/region/r.-1.-1.mca differ diff --git a/EstiNet/region/r.-1.0.mca b/EstiNet/region/r.-1.0.mca index 4e7ba1c..3129044 100644 Binary files a/EstiNet/region/r.-1.0.mca and b/EstiNet/region/r.-1.0.mca differ diff --git a/EstiNet/region/r.-1.1.mca b/EstiNet/region/r.-1.1.mca index 2d9a995..c6e67eb 100644 Binary files a/EstiNet/region/r.-1.1.mca and b/EstiNet/region/r.-1.1.mca differ diff --git a/EstiNet/region/r.0.-1.mca b/EstiNet/region/r.0.-1.mca index 5795c0c..b08cc98 100644 Binary files a/EstiNet/region/r.0.-1.mca and b/EstiNet/region/r.0.-1.mca differ diff --git a/EstiNet/region/r.0.0.mca b/EstiNet/region/r.0.0.mca index be8d94f..38e7195 100644 Binary files a/EstiNet/region/r.0.0.mca and b/EstiNet/region/r.0.0.mca differ diff --git a/EstiNet/region/r.0.1.mca b/EstiNet/region/r.0.1.mca index b26f926..b7a7f6f 100644 Binary files a/EstiNet/region/r.0.1.mca and b/EstiNet/region/r.0.1.mca differ diff --git a/EstiNet/session.lock b/EstiNet/session.lock index 85f29f7..5e3de12 100644 Binary files a/EstiNet/session.lock and b/EstiNet/session.lock differ diff --git a/bukkit.yml b/bukkit.yml index cf1f598..d998fd7 100644 --- a/bukkit.yml +++ b/bukkit.yml @@ -1,15 +1,15 @@ # This is the main configuration file for Bukkit. # 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 -# http://wiki.bukkit.org/Bukkit.yml +# 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 http://www.spigotmc.org/pages/irc/ ) -# Forums: http://www.spigotmc.org/ -# Bug tracker: http://www.spigotmc.org/go/bugs +# (If this means nothing to you, just go to https://www.spigotmc.org/go/irc ) +# Forums: https://www.spigotmc.org/ +# Bug tracker: https://www.spigotmc.org/go/bugs settings: diff --git a/commands.yml b/commands.yml index 6c5e6d4..780e2ae 100644 --- a/commands.yml +++ b/commands.yml @@ -1,17 +1,18 @@ # This is the commands configuration file for Bukkit. # For documentation on how to make use of this file, check out the Bukkit Wiki at -# http://wiki.bukkit.org/Commands.yml +# 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 http://www.spigotmc.org/pages/irc/ ) -# Forums: http://www.spigotmc.org/ -# Bug tracker: http://www.spigotmc.org/go/bugs +# (If this means nothing to you, just go to https://www.spigotmc.org/go/irc ) +# Forums: https://www.spigotmc.org/ +# Bug tracker: https://www.spigotmc.org/go/bugs command-block-overrides: [] -unrestricted-advancements: false +ignore-vanilla-permissions: false aliases: icanhasbukkit: - version +unrestricted-advancements: false diff --git a/minecraft_server.jar b/minecraft_server.jar index ceba98c..95bc2ec 100644 Binary files a/minecraft_server.jar and b/minecraft_server.jar differ diff --git a/paper.yml b/paper.yml index 60c121b..16b4503 100644 --- a/paper.yml +++ b/paper.yml @@ -3,27 +3,54 @@ # with caution, and make sure you know what each option does before configuring. # # If you need help with the configuration or have any questions related to Paper, -# join us in our IRC channel. +# join us in our Discord or IRC channel. # +# Discord: https://paperdiscord.emc.gs # IRC: #paper @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=paper ) -# Wiki: https://paper.readthedocs.org/ -# Paper Forums: https://aquifermc.org/ +# Website: https://papermc.io/ +# Docs: https://paper.readthedocs.org/ verbose: false -config-version: 13 +config-version: 15 settings: - enable-player-collisions: true - player-auto-save-rate: -1 - min-chunk-load-threads: 2 - bungee-online-mode: true load-permissions-yml-before-plugins: true + bungee-online-mode: true + queue-light-updates-max-loss: 10 suggest-player-names-when-null-tab-completions: true + watchdog: + early-warning-every: 5000 + early-warning-delay: 10000 + spam-limiter: + tab-spam-increment: 1 + tab-spam-limit: 500 + save-player-data: true sleep-between-chunk-saves: false - incoming-packet-spam-threshold: 300 - save-empty-scoreboard-teams: false region-file-cache-size: 256 + save-empty-scoreboard-teams: false + incoming-packet-spam-threshold: 300 remove-invalid-statistics: false + use-versioned-world: false + velocity-support: + enabled: false + online-mode: false + secret: '' + enable-player-collisions: true + player-auto-save-rate: -1 + max-player-auto-save-per-tick: -1 + async-chunks: + enable: true + generation: true + thread-per-world-generation: true + load-threads: -1 + use-alternative-luck-formula: false + min-chunk-load-threads: 2 set-health-before-death-event: false +messages: + kick: + flying-player: Flying is not enabled on this server + flying-vehicle: Flying is not enabled on this server + connection-throttle: Connection throttled! Please wait before reconnecting. + authentication-servers-down: '' timings: enabled: true verbose: true @@ -33,69 +60,123 @@ timings: - settings.bungeecord-addresses history-interval: 300 history-length: 3600 -messages: - kick: - flying-player: Flying is not enabled on this server - flying-vehicle: Flying is not enabled on this server world-settings: default: - keep-spawn-loaded-range: 8 - auto-save-interval: -1 - nether-ceiling-void-damage: false - hopper: - push-based: false - allow-non-player-entities-on-scoreboards: false - parrots-are-unaffected-by-player-movement: false - elytra-hit-wall-damage: true - disable-explosion-knockback: false + lightning-strike-distance-limit: + sound: -1 + impact-sound: -1 + flash: -1 frosted-ice: enabled: true delay: min: 20 max: 40 + lootables: + auto-replenish: false + restrict-player-reloot: true + reset-seed-on-fill: true + max-refills: -1 + refresh-min: 12h + refresh-max: 2d + filter-nbt-data-from-spawn-eggs-and-related: true + fishing-time-range: + MinimumTicks: 100 + MaximumTicks: 600 + optimize-explosions: false + use-vanilla-world-scoreboard-name-coloring: false + delay-chunk-unloads-by: 10s + max-auto-save-chunks-per-tick: 24 + save-queue-limit-for-auto-save: 50 + enable-treasure-maps: true + treasure-maps-return-already-discovered: false + max-chunk-sends-per-tick: 81 + max-chunk-gens-per-tick: 10 game-mechanics: + scan-for-legacy-ender-dragon: true + villages-load-chunks: false disable-chest-cat-detection: false disable-end-credits: false - use-alternate-fallingblock-onGround-detection: false - prevent-tnt-from-moving-in-water: false - non-player-arrow-despawn-rate: -1 - grass-spread-tick-rate: 1 - keep-spawn-loaded: true - armor-stands-do-collision-entity-lookups: true + disable-player-crits: false + disable-sprint-interruption-on-attack: false + shield-blocking-delay: 5 + disable-unloaded-chunk-enderpearl-exploit: true + prevent-moving-into-unloaded-chunks: false + max-growth-height: + cactus: 3 + reeds: 3 + despawn-ranges: + soft: 32 + hard: 128 + falling-block-height-nerf: 0 + tnt-entity-height-nerf: 0 + portal-search-radius: 128 + remove-corrupt-tile-entities: false + use-chunk-inhabited-timer: true + queue-light-updates: false + max-entity-collisions: 8 + disable-creeper-lingering-effect: false + hopper: + cooldown-when-full: true + disable-move-event: false + push-based: false + duplicate-uuid-resolver: saferegen + duplicate-uuid-saferegen-delete-range: 32 + keep-spawn-loaded-range: 8 + disable-thunder: false skeleton-horse-thunder-spawn-chance: 0.01 - fire-physics-event-for-redstone: false disable-ice-and-snow: false + auto-save-interval: -1 + fire-physics-event-for-redstone: false + keep-spawn-loaded: true + anti-xray: + enabled: false + engine-mode: 1 + chunk-edge-mode: 1 + max-chunk-section-index: 3 + update-radius: 2 + hidden-blocks: + - gold_ore + - iron_ore + - coal_ore + - lapis_ore + - mossy_cobblestone + - obsidian + - chest + - diamond_ore + - redstone_ore + - lit_redstone_ore + - clay + - emerald_ore + - ender_chest + replacement-blocks: + - stone + - planks + experience-merge-max-value: -1 + skip-entity-ticking-in-chunks-scheduled-for-unload: true + armor-stands-do-collision-entity-lookups: true + water-over-lava-flow-speed: 5 + bed-search-radius: 1 + grass-spread-tick-rate: 1 + container-update-tick-rate: 1 + nether-ceiling-void-damage: false + allow-non-player-entities-on-scoreboards: false + parrots-are-unaffected-by-player-movement: false + prevent-tnt-from-moving-in-water: false + non-player-arrow-despawn-rate: -1 + creative-arrow-despawn-rate: -1 + disable-explosion-knockback: false + armor-stands-tick: true spawner-nerfed-mobs-should-jump: false - baby-zombie-movement-speed: 0.5 allow-leashing-undead-horse: false + baby-zombie-movement-speed: 0.5 all-chunks-are-slime-chunks: false mob-spawner-tick-rate: 1 - disable-teleportation-suffocation-check: false - portal-search-radius: 128 - save-queue-limit-for-auto-save: 50 - delay-chunk-unloads-by: 10s - use-vanilla-world-scoreboard-name-coloring: false - max-auto-save-chunks-per-tick: 24 squid-spawn-height: - minimum: 45.0 maximum: 63.0 - optimize-explosions: false - water-over-lava-flow-speed: 5 - queue-light-updates: false - max-entity-collisions: 8 - filter-nbt-data-from-spawn-eggs-and-related: true - lootables: - auto-replenish: false - restrict-player-reloot: true - reset-seed-on-fill: true - max-refills: -1 - refresh-min: 12h - refresh-max: 2d - disable-creeper-lingering-effect: false - disable-thunder: false - enable-treasure-maps: true - treasure-maps-return-already-discovered: false - container-update-tick-rate: 1 + minimum: 45.0 + disable-teleportation-suffocation-check: false + elytra-hit-wall-damage: true + use-alternate-fallingblock-onGround-detection: false generator-settings: canyon: true caves: true @@ -107,24 +188,11 @@ world-settings: temple: true village: true flat-bedrock: false - max-growth-height: - cactus: 3 - reeds: 3 - remove-corrupt-tile-entities: false lava-flow-speed: normal: 30 nether: 10 - despawn-ranges: - soft: 32 - hard: 128 - falling-block-height-nerf: 0 - tnt-entity-height-nerf: 0 fast-drain: lava: false water: false - use-chunk-inhabited-timer: true - fishing-time-range: - MinimumTicks: 100 - MaximumTicks: 600 enable-old-tnt-cannon-behaviors: false verbose: false diff --git a/plugins/CrackShot.jar b/plugins/CrackShot.jar deleted file mode 100644 index a930b43..0000000 Binary files a/plugins/CrackShot.jar and /dev/null differ diff --git a/plugins/HolographicDisplays.jar b/plugins/HolographicDisplays.jar index 500119a..8ba5606 100644 Binary files a/plugins/HolographicDisplays.jar and b/plugins/HolographicDisplays.jar differ diff --git a/plugins/HolographicDisplays/config.yml b/plugins/HolographicDisplays/config.yml index f687d86..cb009a1 100644 --- a/plugins/HolographicDisplays/config.yml +++ b/plugins/HolographicDisplays/config.yml @@ -29,3 +29,4 @@ time: zone: GMT+1 update-notification: true debug: false +precise-hologram-movement: true diff --git a/plugins/ProtocolSupport.jar b/plugins/ProtocolSupport.jar new file mode 100644 index 0000000..c641812 Binary files /dev/null and b/plugins/ProtocolSupport.jar differ diff --git a/plugins/WorldEdit.jar b/plugins/WorldEdit.jar index 9411332..dd3167f 100644 Binary files a/plugins/WorldEdit.jar and b/plugins/WorldEdit.jar differ diff --git a/plugins/gFeatures.jar b/plugins/gFeatures.jar index c2c411d..e8025ca 100644 Binary files a/plugins/gFeatures.jar and b/plugins/gFeatures.jar differ diff --git a/plugins/gFeatures/Config.yml b/plugins/gFeatures/Config.yml index aed7d7e..d29b6cc 100644 --- a/plugins/gFeatures/Config.yml +++ b/plugins/gFeatures/Config.yml @@ -19,12 +19,14 @@ Config: FusionPlay: 'false' SurvivalTwo: 'false' EstiCoins: 'true' + EstiTicket: 'false' Extensions: Utility: gBroadcast: 'false' gMotd: 'false' EstiJoin: 'false' Other: {} + Skript: {} MySQL: Address: localhost Port: '3306' @@ -38,3 +40,4 @@ ClioteSky: Category: MinigameHubs Name: MinigameHub1 Enable: 'true' + CheckTLS: 'false' diff --git a/plugins/gFeatures/gRanks/config.yml b/plugins/gFeatures/gRanks/config.yml index 64d958d..fd0e981 100644 --- a/plugins/gFeatures/gRanks/config.yml +++ b/plugins/gFeatures/gRanks/config.yml @@ -7,3 +7,4 @@ Config: Password: EstiNetwork?123 ClioteSky: Enable: 'true' + Cached: 'true' diff --git a/server.properties b/server.properties index 453cdff..ec04eae 100644 --- a/server.properties +++ b/server.properties @@ -1,39 +1,42 @@ -#Minecraft server properties -#Mon Sep 11 17:05:28 EDT 2017 -spawn-protection=16 -server-name=Unknown Server -generator-settings= -force-gamemode=true -allow-nether=false -gamemode=2 -broadcast-console-to-ops=true -enable-query=false -player-idle-timeout=0 -difficulty=0 -spawn-monsters=false -op-permission-level=4 -pvp=false -snooper-enabled=true -level-type=DEFAULT -hardcore=false -enable-command-block=false -max-players=100 -network-compression-threshold=256 -resource-pack-sha1= -max-world-size=29999984 -debug=false -server-ip= -spawn-npcs=false -allow-flight=false -level-name=EstiNet -view-distance=10 -resource-pack= -spawn-animals=false -white-list=false -generate-structures=false -online-mode=false -max-build-height=256 -level-seed= -prevent-proxy-connections=false -motd=A Minecraft Server -enable-rcon=false +#Minecraft server properties +#Sun Oct 28 22:02:53 EDT 2018 +spawn-protection=16 +server-name=Unknown Server +generator-settings= +force-gamemode=true +allow-nether=false +enforce-whitelist=false +gamemode=2 +broadcast-console-to-ops=true +enable-query=false +player-idle-timeout=0 +difficulty=0 +spawn-monsters=false +op-permission-level=4 +pvp=false +snooper-enabled=true +level-type=DEFAULT +hardcore=false +enable-command-block=false +max-players=100 +network-compression-threshold=256 +resource-pack-sha1= +max-world-size=29999984 +server-port=25565 +debug=false +server-ip= +spawn-npcs=false +allow-flight=false +level-name=EstiNet +view-distance=10 +resource-pack= +spawn-animals=false +white-list=false +generate-structures=false +online-mode=false +max-build-height=256 +level-seed= +use-native-transport=true +prevent-proxy-connections=false +enable-rcon=false +motd=A Minecraft Server diff --git a/spigot.yml b/spigot.yml index e3c6a90..cc812da 100644 --- a/spigot.yml +++ b/spigot.yml @@ -12,16 +12,17 @@ config-version: 11 settings: - debug: false save-user-cache-on-stop-only: false - moved-wrongly-threshold: 0.0625 - moved-too-quickly-multiplier: 10.0 - filter-creative-items: true - int-cache-limit: 1024 sample-count: 12 - player-shuffle: 0 + timeout-time: 60 + restart-on-crash: false + restart-script: ./start.bat bungeecord: true - item-dirty-ticks: 20 + late-bind: false + player-shuffle: 0 + user-cache-size: 1000 + moved-wrongly-threshold: 0.0625 + moved-too-quickly-multiplier: 10.0 netty-threads: 4 attribute: maxHealth: @@ -30,11 +31,10 @@ settings: max: 2048.0 attackDamage: max: 2048.0 - user-cache-size: 1000 - timeout-time: 60 - restart-on-crash: false - restart-script: ./start.bat - late-bind: false + debug: false + filter-creative-items: true + int-cache-limit: 1024 + item-dirty-ticks: 20 moved-too-quickly-threshold: 100.0 messages: whitelist: '[&6&lEsti&3&lNet&r]&7You aren''t whitelisted.' @@ -43,60 +43,34 @@ messages: outdated-client: '[&6&lEsti&3&lNet&r]&7Outdated client! Please use {0}' outdated-server: '[&6&lEsti&3&lNet&r]&7Outdated server! I''m still on {0}' restart: '[&6&lEsti&3&lNet&r]&7Restart incoming...' +stats: + disable-saving: false + forced-stats: {} commands: tab-complete: 0 + send-namespaced: true + log: true + spam-exclusions: + - /skill silent-commandblock-console: false replace-commands: - setblock - summon - testforblock - tellraw - log: true - spam-exclusions: - - /skill advancements: disable-saving: false disabled: - minecraft:story/disabled -stats: - disable-saving: false - forced-stats: {} world-settings: default: verbose: true - arrow-despawn-rate: 1200 - item-despawn-rate: 6000 - merge-radius: - item: 2.5 - exp: 3.0 - enable-zombie-pigmen-portal-spawns: false - wither-spawn-sound-radius: 0 - view-distance: 10 - hanging-tick-frequency: 100 - zombie-aggressive-towards-villager: false - seed-village: 10387312 - seed-feature: 14357617 - seed-monument: 10387313 - seed-slime: 987234911 - dragon-death-sound-radius: 0 - nerf-spawner-mobs: false - save-structure-info: true entity-activation-range: animals: 0 monsters: 0 misc: 16 - max-tnt-per-tick: 0 - max-tick-time: - tile: 50 - entity: 50 - hunger: - jump-walk-exhaustion: 0.05 - jump-sprint-exhaustion: 0.2 - combat-exhaustion: 0.1 - regen-exhaustion: 6.0 - swim-multiplier: 0.01 - sprint-multiplier: 0.1 - other-multiplier: 0.0 + water: 16 + tick-inactive-villagers: true entity-tracking-range: players: 48 animals: 48 @@ -108,7 +82,16 @@ world-settings: hopper-check: 1 hopper-amount: 0 random-light-updates: false - mob-spawn-range: 0 + dragon-death-sound-radius: 0 + seed-village: 10387312 + seed-desert: 14357617 + seed-igloo: 14357618 + seed-jungle: 14357619 + seed-swamp: 14357620 + seed-monument: 10387313 + seed-shipwreck: 165745295 + seed-ocean: 14357621 + seed-slime: 987234911 growth: cactus-modifier: 0 cane-modifier: 0 @@ -120,6 +103,34 @@ world-settings: netherwart-modifier: 0 vine-modifier: 100 cocoa-modifier: 100 + mob-spawn-range: 0 + hunger: + jump-walk-exhaustion: 0.05 + jump-sprint-exhaustion: 0.2 + combat-exhaustion: 0.1 + regen-exhaustion: 6.0 + swim-multiplier: 0.01 + sprint-multiplier: 0.1 + other-multiplier: 0.0 + max-tnt-per-tick: 0 + max-tick-time: + tile: 50 + entity: 50 + squid-spawn-range: + min: 45.0 + merge-radius: + exp: 3.0 + item: 2.5 + enable-zombie-pigmen-portal-spawns: false + wither-spawn-sound-radius: 0 + item-despawn-rate: 6000 + view-distance: 10 + arrow-despawn-rate: 1200 + hanging-tick-frequency: 100 + zombie-aggressive-towards-villager: false + nerf-spawner-mobs: false + seed-feature: 14357617 + save-structure-info: true max-entity-collisions: 8 chunks-per-tick: 650 clear-tick-list: false diff --git a/version_history.json b/version_history.json new file mode 100644 index 0000000..b2c13fb --- /dev/null +++ b/version_history.json @@ -0,0 +1 @@ +{"currentVersion":"git-Paper-408 (MC: 1.13.2)"} \ No newline at end of file