diff --git a/Dockerfile b/Dockerfile index e76b855..c1d912a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM frolvlad/alpine-oraclejdk8 +FROM adoptopenjdk/openjdk11-openj9 MAINTAINER EstiNet diff --git a/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json b/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json index 731ae11..a3876b7 100644 --- a/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json +++ b/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json @@ -11,6 +11,18 @@ }, "done": true }, + "minecraft:recipes/decorations/smoker": { + "criteria": { + "has_furnace": "2019-07-29 21:49:27 -0400" + }, + "done": true + }, + "minecraft:recipes/misc/iron_nugget_from_blasting": { + "criteria": { + "has_iron_axe": "2019-07-29 21:50:07 -0400" + }, + "done": true + }, "minecraft:recipes/misc/map": { "criteria": { "has_compass": "2018-02-10 12:23:41 -0500" @@ -52,5 +64,6 @@ "minecraft:plains": "2018-02-10 12:23:42 -0500" }, "done": false - } + }, + "DataVersion": 1976 } \ No newline at end of file diff --git a/EstiNet/data/raids.dat b/EstiNet/data/raids.dat new file mode 100644 index 0000000..0a932aa Binary files /dev/null and b/EstiNet/data/raids.dat differ diff --git a/EstiNet/data/scoreboard.dat b/EstiNet/data/scoreboard.dat index 547231f..f0485ff 100644 Binary files a/EstiNet/data/scoreboard.dat and b/EstiNet/data/scoreboard.dat differ diff --git a/EstiNet/datapacks/bukkit/pack.mcmeta b/EstiNet/datapacks/bukkit/pack.mcmeta index 76afe9d..f98747c 100644 --- a/EstiNet/datapacks/bukkit/pack.mcmeta +++ b/EstiNet/datapacks/bukkit/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Data pack for resources provided by Bukkit plugins", - "pack_format": 1 + "pack_format": 4 } -} \ No newline at end of file +} diff --git a/EstiNet/level.dat b/EstiNet/level.dat index 777afc4..4ff9f3a 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 c878f3f..1550f35 100644 Binary files a/EstiNet/level.dat_old and b/EstiNet/level.dat_old differ diff --git a/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat b/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat index 4b7dd2c..d807149 100644 Binary files a/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat and b/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat differ diff --git a/EstiNet/poi/r.-1.0.mca b/EstiNet/poi/r.-1.0.mca new file mode 100644 index 0000000..6d17cf9 Binary files /dev/null and b/EstiNet/poi/r.-1.0.mca differ diff --git a/EstiNet/poi/r.-1.1.mca b/EstiNet/poi/r.-1.1.mca new file mode 100644 index 0000000..6d17cf9 Binary files /dev/null and b/EstiNet/poi/r.-1.1.mca differ diff --git a/EstiNet/poi/r.0.0.mca b/EstiNet/poi/r.0.0.mca new file mode 100644 index 0000000..6d17cf9 Binary files /dev/null and b/EstiNet/poi/r.0.0.mca differ diff --git a/EstiNet/poi/r.0.1.mca b/EstiNet/poi/r.0.1.mca new file mode 100644 index 0000000..6d17cf9 Binary files /dev/null and b/EstiNet/poi/r.0.1.mca differ diff --git a/EstiNet/region/r.-1.0.mca b/EstiNet/region/r.-1.0.mca index 4c4e2b3..9912b63 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 de71c55..103bb25 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.0.mca b/EstiNet/region/r.0.0.mca index 91f2cf5..8611be7 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 11636a5..f222840 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 354b462..5b1aea4 100644 Binary files a/EstiNet/session.lock and b/EstiNet/session.lock differ diff --git a/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json b/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json index 2dc66a6..497dc17 100644 --- a/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json +++ b/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json @@ -1 +1 @@ -{"stats":{"minecraft:custom":{"minecraft:jump":215,"minecraft:time_since_rest":17016,"minecraft:play_one_minute":64093,"minecraft:crouch_one_cm":11319,"minecraft:leave_game":8,"minecraft:sprint_one_cm":42612,"minecraft:time_since_death":64093,"minecraft:walk_on_water_one_cm":3813,"minecraft:walk_one_cm":35944,"minecraft:sneak_time":4388,"minecraft:walk_under_water_one_cm":5787,"minecraft:swim_one_cm":2528,"minecraft:fly_one_cm":1125120}},"DataVersion":1631} \ No newline at end of file +{"stats":{"minecraft:custom":{"minecraft:jump":265,"minecraft:time_since_rest":32118,"minecraft:play_one_minute":79195,"minecraft:crouch_one_cm":11771,"minecraft:leave_game":10,"minecraft:sprint_one_cm":50006,"minecraft:time_since_death":79195,"minecraft:walk_on_water_one_cm":4881,"minecraft:walk_one_cm":49929,"minecraft:sneak_time":4520,"minecraft:walk_under_water_one_cm":7285,"minecraft:swim_one_cm":5752,"minecraft:fly_one_cm":1310403}},"DataVersion":1976} \ No newline at end of file diff --git a/bukkit.yml b/bukkit.yml index d998fd7..5572b07 100644 --- a/bukkit.yml +++ b/bukkit.yml @@ -13,6 +13,7 @@ settings: + minimum-api: none allow-end: false warn-on-overload: true permissions-file: permissions.yml diff --git a/config.json b/config.json index 0411428..6ef0eb5 100644 --- a/config.json +++ b/config.json @@ -11,7 +11,7 @@ { "instance_name": "Hub", "home_directory": "./", - "command_to_run": "java -Xms512M -Xmx2G -XX:+UseG1GC -XX:ParallelGCThreads=2 -XX:+AggressiveOpts -d64 -server -Dpaper.disableChannelLimit=true -jar minecraft_server.jar", + "command_to_run": "java -Xms512M -Xmx2G -XX:+UseG1GC -XX:ParallelGCThreads=2 -server -Dpaper.disableChannelLimit=true -jar minecraft_server.jar", "max_lines": 2000, "amount_of_lines_to_cut_on_max": 100, "stop_process_command": "exit", @@ -27,4 +27,4 @@ "password": "EstiNetwork?123" } ] -} +} \ No newline at end of file diff --git a/logs/2019-07-29-1.log.gz b/logs/2019-07-29-1.log.gz new file mode 100644 index 0000000..bf27b4e Binary files /dev/null and b/logs/2019-07-29-1.log.gz differ diff --git a/logs/2019-07-29-2.log.gz b/logs/2019-07-29-2.log.gz new file mode 100644 index 0000000..d9ffeb8 Binary files /dev/null and b/logs/2019-07-29-2.log.gz differ diff --git a/logs/2019-07-29-3.log.gz b/logs/2019-07-29-3.log.gz new file mode 100644 index 0000000..fe12c6e Binary files /dev/null and b/logs/2019-07-29-3.log.gz differ diff --git a/minecraft_server.jar b/minecraft_server.jar index 37cdb2b..1f20f09 100644 Binary files a/minecraft_server.jar and b/minecraft_server.jar differ diff --git a/paper.yml b/paper.yml index 31f0a80..021018b 100644 --- a/paper.yml +++ b/paper.yml @@ -11,7 +11,7 @@ # Docs: https://paper.readthedocs.org/ verbose: false -config-version: 15 +config-version: 19 settings: load-permissions-yml-before-plugins: true bungee-online-mode: true @@ -45,13 +45,19 @@ settings: use-alternative-luck-formula: false min-chunk-load-threads: 2 set-health-before-death-event: false + book-size: + page-max: 2560 + total-multiplier: 0.98 messages: + no-permission: '&cI''m sorry, but you do not have permission to perform this command. + Please contact the server administrators if you believe that this is in error.' kick: authentication-servers-down: '' connection-throttle: Connection throttled! Please wait before reconnecting. flying-player: Flying is not enabled on this server flying-vehicle: Flying is not enabled on this server timings: + server-name: Unknown Server enabled: true verbose: true server-name-privacy: false @@ -62,7 +68,10 @@ timings: history-length: 3600 world-settings: default: - use-chunk-inhabited-timer: true + fixed-chunk-inhabited-time: -1 + count-all-mobs-for-spawning: false + nether-ceiling-void-damage-height: 0 + use-faster-eigencraft-redstone: false queue-light-updates: false optimize-explosions: false use-vanilla-world-scoreboard-name-coloring: false @@ -75,6 +84,7 @@ world-settings: max-chunk-sends-per-tick: 81 max-chunk-gens-per-tick: 10 game-mechanics: + disable-relative-projectile-velocity: false scan-for-legacy-ender-dragon: true villages-load-chunks: false disable-chest-cat-detection: false @@ -126,7 +136,7 @@ world-settings: anti-xray: enabled: false engine-mode: 1 - chunk-edge-mode: 1 + chunk-edge-mode: 2 max-chunk-section-index: 3 update-radius: 2 hidden-blocks: @@ -139,13 +149,12 @@ world-settings: - chest - diamond_ore - redstone_ore - - lit_redstone_ore - clay - emerald_ore - ender_chest replacement-blocks: - stone - - planks + - oak_planks experience-merge-max-value: -1 skip-entity-ticking-in-chunks-scheduled-for-unload: true armor-stands-do-collision-entity-lookups: true diff --git a/plugins/Advanced-Portals.jar b/plugins/Advanced-Portals.jar index c1f9e83..36112f6 100644 Binary files a/plugins/Advanced-Portals.jar and b/plugins/Advanced-Portals.jar differ diff --git a/plugins/AdvancedPortals/portals.yml b/plugins/AdvancedPortals/portals.yml index fa2454f..56f02f1 100644 --- a/plugins/AdvancedPortals/portals.yml +++ b/plugins/AdvancedPortals/portals.yml @@ -92,15 +92,3 @@ gWars: X: -152 Y: 100 Z: 510 -SkyAdventures: - world: EstiNet - triggerblock: WATER - bungee: SkyAdventures - pos1: - X: -96 - Y: 104 - Z: 460 - pos2: - X: -99 - Y: 100 - Z: 457 diff --git a/plugins/ChestCommands.jar b/plugins/ChestCommands.jar index bcb0cac..03facce 100644 Binary files a/plugins/ChestCommands.jar and b/plugins/ChestCommands.jar differ diff --git a/plugins/ChestCommands/lang.yml b/plugins/ChestCommands/lang.yml index 94766de..a64fba9 100644 --- a/plugins/ChestCommands/lang.yml +++ b/plugins/ChestCommands/lang.yml @@ -9,3 +9,4 @@ no-required-item: '&cYou must have &e{amount}x {material} &c(ID: {id}, data valu {datavalue}) for this.' open-menu-others: '&aOpening the menu "{menu}" to {player}.' any: any +money-taken: '&a{money}$ have been taken from your account.' diff --git a/plugins/HolographicDisplays.jar b/plugins/HolographicDisplays.jar index 3e2ffdd..d5bab8c 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 cb009a1..b8b0739 100644 --- a/plugins/HolographicDisplays/config.yml +++ b/plugins/HolographicDisplays/config.yml @@ -30,3 +30,4 @@ time: update-notification: true debug: false precise-hologram-movement: true +quick-edit-commands: true diff --git a/plugins/HolographicDisplays/database.yml b/plugins/HolographicDisplays/database.yml index 8340f1d..c8c6920 100644 --- a/plugins/HolographicDisplays/database.yml +++ b/plugins/HolographicDisplays/database.yml @@ -50,7 +50,7 @@ gwars: factions: location: EstiNet, -91.545, 106.000, 485.442 lines: - - '&c&lFactions (OFFLINE)' + - '&c&lFactions' notreadys: location: EstiNet, 188.495, 245.700, -10.491 lines: @@ -67,6 +67,7 @@ skyfactory: location: EstiNet, -99.453, 101.200, 461.398 lines: - '&5&lSky Adventures (Modded)' + - '&lJoin with the IP &b&lsky.estinet.net&l!' skyfactory2: location: EstiNet, -118.522, 112.000, 480.530 lines: diff --git a/plugins/ProtocolSupport.jar b/plugins/ProtocolSupport.jar index cccceb1..7bc63d7 100644 Binary files a/plugins/ProtocolSupport.jar and b/plugins/ProtocolSupport.jar differ diff --git a/plugins/WorldEdit.jar b/plugins/WorldEdit.jar index dd3167f..0b92613 100644 Binary files a/plugins/WorldEdit.jar and b/plugins/WorldEdit.jar differ diff --git a/plugins/WorldEdit/sessions/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json b/plugins/WorldEdit/sessions/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json new file mode 100644 index 0000000..3307157 --- /dev/null +++ b/plugins/WorldEdit/sessions/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json @@ -0,0 +1 @@ +{"useServerCUI":false,"wandItem":"minecraft:wooden_axe","navWandItem":"minecraft:compass"} \ No newline at end of file diff --git a/plugins/gFeatures.jar b/plugins/gFeatures.jar index 321b64c..bd84ba3 100644 Binary files a/plugins/gFeatures.jar and b/plugins/gFeatures.jar differ diff --git a/server.properties b/server.properties index f9be298..e1e50e2 100644 --- a/server.properties +++ b/server.properties @@ -1,25 +1,31 @@ #Minecraft server properties -#Sat Oct 27 20:53:33 EDT 2018 +#Mon Jul 29 21:51:26 EDT 2019 +spawn-protection=0 +max-tick-time=60000 +query.port=25565 generator-settings= force-gamemode=false allow-nether=false enforce-whitelist=false -gamemode=0 +gamemode=survival broadcast-console-to-ops=true enable-query=false player-idle-timeout=0 -difficulty=0 +difficulty=peaceful spawn-monsters=false +broadcast-rcon-to-ops=true op-permission-level=4 pvp=false snooper-enabled=true -level-type=DEFAULT +level-type=default hardcore=false enable-command-block=false max-players=300 network-compression-threshold=256 resource-pack-sha1= max-world-size=29999984 +function-permission-level=2 +rcon.port=25575 server-port=25565 debug=false server-ip= @@ -30,9 +36,10 @@ view-distance=10 resource-pack= spawn-animals=false white-list=false +rcon.password= generate-structures=false -online-mode=false max-build-height=256 +online-mode=false level-seed= prevent-proxy-connections=false use-native-transport=true diff --git a/spigot.yml b/spigot.yml index 3ab5c8c..25117cd 100644 --- a/spigot.yml +++ b/spigot.yml @@ -10,14 +10,14 @@ # IRC: #spigot @ irc.spi.gt ( http://www.spigotmc.org/pages/irc/ ) # Forums: http://www.spigotmc.org/ -config-version: 11 +config-version: 12 settings: save-user-cache-on-stop-only: false sample-count: 12 timeout-time: 60 restart-on-crash: false restart-script: ./start.bat - bungeecord: true + bungeecord: false late-bind: false player-shuffle: 0 user-cache-size: 1000 @@ -64,8 +64,15 @@ advancements: - minecraft:story/disabled world-settings: default: + seed-outpost: 165745296 verbose: true growth: + beetroot-modifier: 100 + carrot-modifier: 100 + potato-modifier: 100 + bamboo-modifier: 100 + sweetberry-modifier: 100 + kelp-modifier: 100 cactus-modifier: 0 cane-modifier: 0 melon-modifier: 0 @@ -77,6 +84,7 @@ world-settings: vine-modifier: 100 cocoa-modifier: 100 entity-activation-range: + raiders: 48 animals: 0 monsters: 0 misc: 16 @@ -123,7 +131,6 @@ world-settings: item: 2.5 enable-zombie-pigmen-portal-spawns: false item-despawn-rate: 6000 - view-distance: 10 arrow-despawn-rate: 1200 wither-spawn-sound-radius: 0 hanging-tick-frequency: 100 diff --git a/usercache.json b/usercache.json index cfbeac5..fb88d84 100644 --- a/usercache.json +++ b/usercache.json @@ -1 +1 @@ -[{"name":"EspiDev","uuid":"4ad26a62-db2a-3ff7-a9b2-83ff8441e443","expiresOn":"2018-11-27 20:56:06 -0500"}] \ No newline at end of file +[{"name":"EspiDev","uuid":"4ad26a62-db2a-3ff7-a9b2-83ff8441e443","expiresOn":"2019-08-29 21:51:47 -0400"}] \ No newline at end of file diff --git a/version_history.json b/version_history.json index 9d1466d..e99e0d2 100644 --- a/version_history.json +++ b/version_history.json @@ -1 +1 @@ -{"currentVersion":"git-Paper-405 (MC: 1.13.2)"} \ No newline at end of file +{"oldVersion":"git-Paper-405 (MC: 1.13.2)","currentVersion":"git-Paper-152 (MC: 1.14.4)"} \ No newline at end of file diff --git a/wepif.yml b/wepif.yml index 5cec7fd..3ba2c2c 100644 --- a/wepif.yml +++ b/wepif.yml @@ -20,7 +20,7 @@ # - See http://wiki.sk89q.com/wiki/WorldEdit/Permissions/Bukkit # - Now with multiworld support (see example) - + ignore-nijiperms-bridges: true resolvers: enabled: @@ -31,6 +31,8 @@ resolvers: - NijiPermissionsResolver - DinnerPermsResolver - FlatFilePermissionsResolver + disabled: + - VaultResolver permissions: groups: default: