diff --git a/Dockerfile b/Dockerfile index 1659991..f0d0382 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM frolvlad/alpine-oraclejdk8 +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 new file mode 100644 index 0000000..0a789ce --- /dev/null +++ b/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json @@ -0,0 +1,23 @@ +{ + "minecraft:recipes/misc/iron_nugget_from_blasting": { + "criteria": { + "has_iron_axe": "2019-07-29 23:05:25 -0400" + }, + "done": true + }, + "minecraft:recipes/misc/iron_nugget_from_smelting": { + "criteria": { + "has_iron_axe": "2019-07-29 23:05:25 -0400" + }, + "done": true + }, + "minecraft:adventure/adventuring_time": { + "criteria": { + "minecraft:dark_forest": "2019-07-29 23:03:26 -0400", + "minecraft:river": "2019-07-29 23:03:24 -0400", + "minecraft:plains": "2019-07-29 23:02:58 -0400" + }, + "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..edfd57a Binary files /dev/null and b/EstiNet/data/raids.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 c303c84..56c42f3 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 328de30..4673ead 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 new file mode 100644 index 0000000..cb08930 Binary files /dev/null and b/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat 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.-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.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/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/region/r.-1.-1.mca b/EstiNet/region/r.-1.-1.mca index 2885e3d..6a1c785 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 3129044..68f7298 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.0.-1.mca b/EstiNet/region/r.0.-1.mca index b08cc98..b6560de 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 38e7195..5c75c00 100644 Binary files a/EstiNet/region/r.0.0.mca and b/EstiNet/region/r.0.0.mca differ diff --git a/EstiNet/session.lock b/EstiNet/session.lock index 5e3de12..d9bf6b8 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 new file mode 100644 index 0000000..55e477b --- /dev/null +++ b/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json @@ -0,0 +1 @@ +{"stats":{"minecraft:custom":{"minecraft:jump":8,"minecraft:time_since_rest":5224,"minecraft:crouch_one_cm":186,"minecraft:play_one_minute":5545,"minecraft:leave_game":1,"minecraft:sprint_one_cm":746,"minecraft:walk_one_cm":1158,"minecraft:damage_taken":560,"minecraft:time_since_death":5099,"minecraft:deaths":2,"minecraft:sneak_time":138,"minecraft:fly_one_cm":65178}},"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/plugins/gFeatures.jar b/cache/mojang_1.14.4.jar similarity index 52% rename from plugins/gFeatures.jar rename to cache/mojang_1.14.4.jar index 321b64c..60afad3 100644 Binary files a/plugins/gFeatures.jar and b/cache/mojang_1.14.4.jar differ diff --git a/cache/patched_1.14.4.jar b/cache/patched_1.14.4.jar new file mode 100644 index 0000000..eae0912 Binary files /dev/null and b/cache/patched_1.14.4.jar differ diff --git a/config.json b/config.json index c633ba7..ea4dbbd 100644 --- a/config.json +++ b/config.json @@ -11,7 +11,7 @@ { "instance_name": "MinigameHub", "home_directory": "./", - "command_to_run": "java -Xms512M -Xmx2G -XX:+UseG1GC -XX:ParallelGCThreads=2 -XX:+AggressiveOpts -d64 -server -jar minecraft_server.jar", + "command_to_run": "/opt/java/openjdk/bin/java -Xms512M -Xmx2G -XX:+UseG1GC -XX:ParallelGCThreads=2 -server -jar minecraft_server.jar", "max_lines": 2000, "amount_of_lines_to_cut_on_max": 100, "stop_process_command": "exit", 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/ops.json b/ops.json index e2bc2e5..236c6a9 100644 --- a/ops.json +++ b/ops.json @@ -1,4 +1,10 @@ [ + { + "uuid": "4ad26a62-db2a-3ff7-a9b2-83ff8441e443", + "name": "EspiDev", + "level": 4, + "bypassesPlayerLimit": false + }, { "uuid": "55618dfa-b17f-4e8a-814f-41768360af09", "name": "_InDev_", diff --git a/paper.yml b/paper.yml index 16b4503..2f0e102 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: 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: + server-name: Unknown Server enabled: true verbose: true server-name-privacy: false @@ -62,6 +68,10 @@ timings: history-length: 3600 world-settings: default: + fixed-chunk-inhabited-time: -1 + count-all-mobs-for-spawning: false + nether-ceiling-void-damage-height: 0 + use-faster-eigencraft-redstone: false lightning-strike-distance-limit: sound: -1 impact-sound: -1 @@ -92,6 +102,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 @@ -111,7 +122,6 @@ world-settings: 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 @@ -131,7 +141,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: @@ -144,13 +154,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 new file mode 100644 index 0000000..36112f6 Binary files /dev/null and b/plugins/Advanced-Portals.jar differ diff --git a/plugins/AdvancedPortals/config.yml b/plugins/AdvancedPortals/config.yml new file mode 100644 index 0000000..22ceada --- /dev/null +++ b/plugins/AdvancedPortals/config.yml @@ -0,0 +1,90 @@ +# Advanced Portals Config + +# To set this file back to its default state just delete it and reload the server or restart it! + + + +# Set to true if you want the normal axes to work normally but the ones gived with /portals selector or wand will still work though +# It can be usefull if people with permission want to use an iron axe on a survival server +UseOnlyServerMadeAxe: false + +# Preferably an item and not a block but it shouldnt matter +AxeItemId: IRON_AXE + +# Will be implemented so you can give yourself the portal block and build manually with it so its easier to make portals with the portal block. +CanBuildPortalBlock: true + +# Defines if portals protect themselves +PortalProtection: true + +# How many blocks around the portals will be protected from griefing or destruction +PortalProtectionRadius: 5 + +# What the default trigger block is for portals if nothing is defined. +DefaultPortalTriggerBlock: PORTAL + +# This stops all water flowing inside a portal area(can be disabled if something like world edit is handelling the water flow or you dont want it active) +# you want to +StopWaterFlow: true + +# This must be a placeable block or it will not work and may even crash +ShowSelectionBlockID: RED_STAINED_GLASS + +# WarpEffect +# 0 = disabled(no particles) +# 1 = Eye of ender explode effect(loads of portal particles) +# adding more soon and may create some custom ones +WarpParticles: 1 + +# WarpSound generally suggested to keep the same as warpeffect but can usually be used for just the sound and no particle effects +# 0 = disabled(no sound) +# 1 = Enderman Warp Sound +# adding more soon +WarpSound: 1 + +# In case you want to show the bungee attempting warp message +ShowBungeeWarpMessage: false + +# This changes how long the show seletion lasts in seconds + +ShowSelectionShowDuration: 10 + +# Where to display the message 0 = disabled(replaces PortalWarpMessages), 1 = in chat and 2 = action bar(1.8 and above only, anything lower will print the message that would +# generally on the action bar in the chat without a prefix or extra chat formatting) +WarpMessageDisplay: 2 + +# Use plugin name in the warp messages +UseWarpPrefix: true + +# If this is true a custom prefix can be used, (not fully coded yet!!) + +UseCustomPrefix: false + +CustomPrefix: '&a[&eAdvancedPortals&a]' + +CustomPrefixFail: '&c[&7AdvancedPortals&c]' + +BlockSpectatorMode: false + +PortalCooldown: 5 # How long after trying to enter a portal until the player can try to enter another. 0 or lower to deactivate. +ThrowbackAmount: 0.7 # How fast to throw them back, 0 or lower to disable throwback + +# Experimental, works but not all the time (Entities don't seem to be provided in the event sometimes or something is wrong) +# We have no plans to further this but if anyone has any tips feel free to contact us here https://discord.gg/25QZVVn +DisableGatewayBeam: false + +# Letters are flags. Include them to activate. n always disables everything, remove if you want it to work. +# Lettering may not make too much sense but meh its useful. Examples are "ocpk" or "cop" (doesnt matter order) +# +# Remember enabling this means potentially admins could leave a portal lying around which could let them reop themselves. +# If you think this may be an issue use a permission plugin and specifically give the users you trust permissions. +# +# n Disabled none, best just put this to really make sure the fact none are here is specified. It disables any others too +# o Admin Heighten Enabled Permission advancedportals.createportal.commandlevel.op +# p Perm Heighten Enabled Permission advancedportals.createportal.commandlevel.perms +# c Console Heighten Enabled Permission advancedportals.createportal.commandlevel.console +# h Ops can create admin commands without special perms +# e Ops can create all perm commands without special perms +# k Ops can create console commands without special perms +# +CommandLevels: opchek diff --git a/plugins/AdvancedPortals/destinations.yml b/plugins/AdvancedPortals/destinations.yml new file mode 100644 index 0000000..a5bee0f --- /dev/null +++ b/plugins/AdvancedPortals/destinations.yml @@ -0,0 +1,7 @@ + +# ExampleDestination: +# world: it will be the world name +# pos: +# X: +# Y: +# Z: diff --git a/plugins/AdvancedPortals/portals.yml b/plugins/AdvancedPortals/portals.yml new file mode 100644 index 0000000..305171d --- /dev/null +++ b/plugins/AdvancedPortals/portals.yml @@ -0,0 +1,56 @@ +# +# ExamplePortal: +# world: it will be the world name +# triggerblock: LAVA # will only be used if the hastriggerblock is true and can be id or text +# pos1: # dont mess with the data here, if you do it may stop the portal from working. +# X: +# Y: +# Z: +# pos2: +# X: +# Y: +# Z: +# destination: +# issetpoint: true # if this was false point name would not be used and the coordinates would be saved here, it just adds more customisation. +# pointname: examplepoint # if issetpoint is false this wont be here and tppos will be. +# tppos: +# X: +# Y: +# Z: + +Gliders: + world: EstiNet + triggerblock: NETHER_PORTAL + bungee: Gliders1 + pos1: + X: 11 + Y: 147 + Z: 21 + pos2: + X: 7 + Y: 144 + Z: 21 +CTF: + world: EstiNet + triggerblock: NETHER_PORTAL + bungee: CTF1 + pos1: + X: -5 + Y: 147 + Z: 21 + pos2: + X: -9 + Y: 144 + Z: 21 +Hub: + world: EstiNet + triggerblock: NETHER_PORTAL + bungee: Hub + pos1: + X: 3 + Y: 146 + Z: -19 + pos2: + X: -1 + Y: 144 + Z: -19 diff --git a/plugins/BungeePortals.jar b/plugins/BungeePortals.jar deleted file mode 100644 index d6490ad..0000000 Binary files a/plugins/BungeePortals.jar and /dev/null differ 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/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/server.properties b/server.properties index ec04eae..2413d2e 100644 --- a/server.properties +++ b/server.properties @@ -1,27 +1,32 @@ #Minecraft server properties -#Sun Oct 28 22:02:53 EDT 2018 +#Mon Jul 29 23:02:30 EDT 2019 spawn-protection=16 +max-tick-time=60000 +query.port=25565 server-name=Unknown Server generator-settings= force-gamemode=true allow-nether=false enforce-whitelist=false -gamemode=2 +gamemode=adventure 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=100 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= @@ -32,11 +37,12 @@ view-distance=10 resource-pack= spawn-animals=false white-list=false +rcon.password= generate-structures=false online-mode=false max-build-height=256 level-seed= -use-native-transport=true prevent-proxy-connections=false -enable-rcon=false +use-native-transport=true motd=A Minecraft Server +enable-rcon=false diff --git a/spigot.yml b/spigot.yml index cc812da..997ad73 100644 --- a/spigot.yml +++ b/spigot.yml @@ -10,7 +10,7 @@ # 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 @@ -64,8 +64,10 @@ advancements: - minecraft:story/disabled world-settings: default: + seed-outpost: 165745296 verbose: true entity-activation-range: + raiders: 48 animals: 0 monsters: 0 misc: 16 @@ -93,6 +95,12 @@ world-settings: seed-ocean: 14357621 seed-slime: 987234911 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 @@ -124,7 +132,6 @@ world-settings: 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 diff --git a/usercache.json b/usercache.json index ba1fc3b..1e6f46b 100644 --- a/usercache.json +++ b/usercache.json @@ -1 +1 @@ -[{"name":"applearon","uuid":"372e5dd6-b1ef-4a8a-8ef0-0895ef0cb2a7","expiresOn":"2017-09-10 14:46:23 -0400"},{"name":"Seshpenguin","uuid":"b48083c2-19ca-4959-a0d0-a967a93d0fd3","expiresOn":"2017-08-19 11:24:49 -0400"}] \ No newline at end of file +[{"name":"EspiDev","uuid":"4ad26a62-db2a-3ff7-a9b2-83ff8441e443","expiresOn":"2019-08-29 23:02:57 -0400"},{"name":"applearon","uuid":"372e5dd6-b1ef-4a8a-8ef0-0895ef0cb2a7","expiresOn":"2017-09-10 14:46:23 -0400"},{"name":"Seshpenguin","uuid":"b48083c2-19ca-4959-a0d0-a967a93d0fd3","expiresOn":"2017-08-19 11:24:49 -0400"}] \ No newline at end of file diff --git a/version_history.json b/version_history.json index b2c13fb..d07a741 100644 --- a/version_history.json +++ b/version_history.json @@ -1 +1 @@ -{"currentVersion":"git-Paper-408 (MC: 1.13.2)"} \ No newline at end of file +{"oldVersion":"git-Paper-408 (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: