diff --git a/commands.yml b/commands.yml new file mode 100644 index 0000000..c615533 --- /dev/null +++ b/commands.yml @@ -0,0 +1,60 @@ +# 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/ +# Bug tracker: https://www.spigotmc.org/go/bugs + +command-block-overrides: [] +ignore-vanilla-permissions: false +aliases: + ban: + - minecraft:ban $1- + clear: + - minecraft:clear $1- + enchant: + - minecraft:enchant $1- + gamemode: + - minecraft:gamemode $1- + give: + - minecraft:give $1- + help: + - bukkit:help $1- + kick: + - minecraft:kick $1- + kill: + - minecraft:kill $1- + list: + - minecraft:list $1- + me: + - minecraft:me $1- + msg: + - minecraft:msg $1- + pardon: + - minecraft:pardon $1- + recipe: + - minecraft:recipe $1- + reload: + - minecraft:reload $1- + tag: + - minecraft:tag $1- + teleport: + - minecraft:teleport $1- + tell: + - minecraft:tell $1- + tellraw: + - minecraft:tellraw $1- + time: + - minecraft:time $1- + tp: + - minecraft:tp $1- + weather: + - minecraft:weather $1- + xp: + - minecraft:xp $1- +unrestricted-advancements: false diff --git a/generate_jre b/generate_jre index 0995ba4..1098722 100755 --- a/generate_jre +++ b/generate_jre @@ -1,7 +1,7 @@ #!/bin/sh # This script is used as a reference to generate a stripped-down OpenJ9 JRE for the server rm -rf java/ -wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-10-12-12-08/OpenJDK11U-jdk_x64_linux_openj9_2019-10-12-12-08.tar.gz +wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10_openj9-0.17.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.5_10_openj9-0.17.0.tar.gz tar -zxvf OpenJDK* rm OpenJDK* mv jdk* jdk/ diff --git a/java/bin/java b/java/bin/java index f04ee3d..1c1b1db 100755 Binary files a/java/bin/java and b/java/bin/java differ diff --git a/java/conf/security/java.security b/java/conf/security/java.security index d6f962c..4f63ef8 100644 --- a/java/conf/security/java.security +++ b/java/conf/security/java.security @@ -1111,3 +1111,51 @@ jdk.sasl.disabledMechanisms= # jdk.security.caDistrustPolicies=SYMANTEC_TLS +# +# FilePermission path canonicalization +# +# This security property dictates how the path argument is processed and stored +# while constructing a FilePermission object. If the value is set to true, the +# path argument is canonicalized and FilePermission methods (such as implies, +# equals, and hashCode) are implemented based on this canonicalized result. +# Otherwise, the path argument is not canonicalized and FilePermission methods are +# implemented based on the original input. See the implementation note of the +# FilePermission class for more details. +# +# If a system property of the same name is also specified, it supersedes the +# security property value defined here. +# +# The default value for this property is false. +# +jdk.io.permissionsUseCanonicalPath=false + + +# +# Policies for the proxy_impersonator Kerberos ccache configuration entry +# +# The proxy_impersonator ccache configuration entry indicates that the ccache +# is a synthetic delegated credential for use with S4U2Proxy by an intermediate +# server. The ccache file should also contain the TGT of this server and +# an evidence ticket from the default principal of the ccache to this server. +# +# This security property determines how Java uses this configuration entry. +# There are 3 possible values: +# +# no-impersonate - Ignore this configuration entry, and always act as +# the owner of the TGT (if it exists). +# +# try-impersonate - Try impersonation when this configuration entry exists. +# If no matching TGT or evidence ticket is found, +# fallback to no-impersonate. +# +# always-impersonate - Always impersonate when this configuration entry exists. +# If no matching TGT or evidence ticket is found, +# no initial credential is read from the ccache. +# +# The default value is "always-impersonate". +# +# If a system property of the same name is also specified, it supersedes the +# security property value defined here. +# +#jdk.security.krb5.default.initiate.credential=always-impersonate + diff --git a/java/lib/compressedrefs/j9ddr.dat b/java/lib/compressedrefs/j9ddr.dat index c42c96d..f984b78 100644 Binary files a/java/lib/compressedrefs/j9ddr.dat and b/java/lib/compressedrefs/j9ddr.dat differ diff --git a/java/lib/compressedrefs/libj9dmp29.so b/java/lib/compressedrefs/libj9dmp29.so index 9b5847f..fc40a8c 100644 Binary files a/java/lib/compressedrefs/libj9dmp29.so and b/java/lib/compressedrefs/libj9dmp29.so differ diff --git a/java/lib/compressedrefs/libj9gc29.so b/java/lib/compressedrefs/libj9gc29.so index dd9049d..534529f 100644 Binary files a/java/lib/compressedrefs/libj9gc29.so and b/java/lib/compressedrefs/libj9gc29.so differ diff --git a/java/lib/compressedrefs/libj9gcchk29.so b/java/lib/compressedrefs/libj9gcchk29.so index 3ef31a6..8da1c96 100644 Binary files a/java/lib/compressedrefs/libj9gcchk29.so and b/java/lib/compressedrefs/libj9gcchk29.so differ diff --git a/java/lib/compressedrefs/libj9hookable29.so b/java/lib/compressedrefs/libj9hookable29.so index f9ee552..93fea47 100644 Binary files a/java/lib/compressedrefs/libj9hookable29.so and b/java/lib/compressedrefs/libj9hookable29.so differ diff --git a/java/lib/compressedrefs/libj9jit29.so b/java/lib/compressedrefs/libj9jit29.so index b96ca2b..de6dfe2 100644 Binary files a/java/lib/compressedrefs/libj9jit29.so and b/java/lib/compressedrefs/libj9jit29.so differ diff --git a/java/lib/compressedrefs/libj9jnichk29.so b/java/lib/compressedrefs/libj9jnichk29.so index bc23b86..84bb7c1 100644 Binary files a/java/lib/compressedrefs/libj9jnichk29.so and b/java/lib/compressedrefs/libj9jnichk29.so differ diff --git a/java/lib/compressedrefs/libj9jvmti29.so b/java/lib/compressedrefs/libj9jvmti29.so index 99bbe97..e4f4bbc 100644 Binary files a/java/lib/compressedrefs/libj9jvmti29.so and b/java/lib/compressedrefs/libj9jvmti29.so differ diff --git a/java/lib/compressedrefs/libj9prt29.so b/java/lib/compressedrefs/libj9prt29.so index f026eaa..6e605c7 100644 Binary files a/java/lib/compressedrefs/libj9prt29.so and b/java/lib/compressedrefs/libj9prt29.so differ diff --git a/java/lib/compressedrefs/libj9shr29.so b/java/lib/compressedrefs/libj9shr29.so index 22e0858..115b98a 100644 Binary files a/java/lib/compressedrefs/libj9shr29.so and b/java/lib/compressedrefs/libj9shr29.so differ diff --git a/java/lib/compressedrefs/libj9trc29.so b/java/lib/compressedrefs/libj9trc29.so index dd40d6c..b8b2024 100644 Binary files a/java/lib/compressedrefs/libj9trc29.so and b/java/lib/compressedrefs/libj9trc29.so differ diff --git a/java/lib/compressedrefs/libj9vm29.so b/java/lib/compressedrefs/libj9vm29.so index d488b40..2077f7f 100644 Binary files a/java/lib/compressedrefs/libj9vm29.so and b/java/lib/compressedrefs/libj9vm29.so differ diff --git a/java/lib/compressedrefs/libj9vmchk29.so b/java/lib/compressedrefs/libj9vmchk29.so index d953d5a..2897bd3 100644 Binary files a/java/lib/compressedrefs/libj9vmchk29.so and b/java/lib/compressedrefs/libj9vmchk29.so differ diff --git a/java/lib/compressedrefs/libj9vrb29.so b/java/lib/compressedrefs/libj9vrb29.so index 99c1a01..621ccfb 100644 Binary files a/java/lib/compressedrefs/libj9vrb29.so and b/java/lib/compressedrefs/libj9vrb29.so differ diff --git a/java/lib/compressedrefs/libjclse29.so b/java/lib/compressedrefs/libjclse29.so index 27a7892..2ae3e83 100644 Binary files a/java/lib/compressedrefs/libjclse29.so and b/java/lib/compressedrefs/libjclse29.so differ diff --git a/java/lib/compressedrefs/libjvm.so b/java/lib/compressedrefs/libjvm.so index 83811b1..72e551a 100644 Binary files a/java/lib/compressedrefs/libjvm.so and b/java/lib/compressedrefs/libjvm.so differ diff --git a/java/lib/compressedrefs/libmanagement.so b/java/lib/compressedrefs/libmanagement.so index 9586983..f1760f5 100644 Binary files a/java/lib/compressedrefs/libmanagement.so and b/java/lib/compressedrefs/libmanagement.so differ diff --git a/java/lib/compressedrefs/libmanagement_ext.so b/java/lib/compressedrefs/libmanagement_ext.so index e30044b..f972178 100644 Binary files a/java/lib/compressedrefs/libmanagement_ext.so and b/java/lib/compressedrefs/libmanagement_ext.so differ diff --git a/java/lib/j9vm/libjvm.so b/java/lib/j9vm/libjvm.so index ac0e6f9..130fa76 100644 Binary files a/java/lib/j9vm/libjvm.so and b/java/lib/j9vm/libjvm.so differ diff --git a/java/lib/java.properties b/java/lib/java.properties index 009fc25..68654ad 100644 --- a/java/lib/java.properties +++ b/java/lib/java.properties @@ -1,4 +1,4 @@ -#Fri Oct 11 18:28:03 UTC 2019 +#Wed Oct 16 11:04:37 UTC 2019 EXEL070=ROM image is wrong version EXEL079=\ -Xscmx set size of new shared class cache to J9VM151=Failed to open jimage library diff --git a/java/lib/jrt-fs.jar b/java/lib/jrt-fs.jar index f9e79fd..95f6048 100644 Binary files a/java/lib/jrt-fs.jar and b/java/lib/jrt-fs.jar differ diff --git a/java/lib/libawt.so b/java/lib/libawt.so index 21c1a32..de0a433 100644 Binary files a/java/lib/libawt.so and b/java/lib/libawt.so differ diff --git a/java/lib/libawt_xawt.so b/java/lib/libawt_xawt.so index 41aa93f..2809631 100644 Binary files a/java/lib/libawt_xawt.so and b/java/lib/libawt_xawt.so differ diff --git a/java/lib/libfontmanager.so b/java/lib/libfontmanager.so index 98996ad..0e28c2a 100644 Binary files a/java/lib/libfontmanager.so and b/java/lib/libfontmanager.so differ diff --git a/java/lib/libjava.so b/java/lib/libjava.so index 6fc6869..ce7ea7a 100644 Binary files a/java/lib/libjava.so and b/java/lib/libjava.so differ diff --git a/java/lib/modules b/java/lib/modules index 069d11a..0fe5966 100644 Binary files a/java/lib/modules and b/java/lib/modules differ diff --git a/java/lib/openj9-notices.html b/java/lib/openj9-notices.html index 3015f5f..a2df31c 100644 --- a/java/lib/openj9-notices.html +++ b/java/lib/openj9-notices.html @@ -13,26 +13,26 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License 2 which accompanies this distribution and is available at https://www.eclipse.org/legal/epl-2.0/ or the Apache License, Version 2.0 which accompanies this distribution and is available at https://www.apache.org/licenses/LICENSE-2.0.

-This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: GNU General Public License, version 2 with the GNU Classpath Exception [1] and GNU General Public License, version 2 with the OpenJDK Assembly Exception [2]. +This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: GNU General Public License, version 2 with the GNU Classpath Exception [1] and GNU General Public License, version 2 with the OpenJDK Assembly Exception [2].

-[1] https://www.gnu.org/software/classpath/license.html +[1] https://www.gnu.org/software/classpath/license.html
[2] http://openjdk.java.net/legal/assembly-exception.html

SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception -

If you did not receive this Content directly from the Eclipse Foundation, the Content is +

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was +apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at https://www.eclipse.org.

Third Party Content

-

The Content includes items that have been sourced from third parties as set out below. If you -did not receive this Content directly from the Eclipse Foundation, the following is provided -for informational purposes only, and you should look to the Redistributor's license for +

The Content includes items that have been sourced from third parties as set out below. If you +did not receive this Content directly from the Eclipse Foundation, the following is provided +for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.

Eclipse OMR

@@ -40,9 +40,9 @@ terms and conditions of use.

This program and the accompanying materials are made available under the terms of the Eclipse Public License 2 which accompanies this distribution and is available at https://www.eclipse.org/legal/epl-2.0/ or the Apache License, Version 2.0 which accompanies this distribution and is available at https://www.apache.org/licenses/LICENSE-2.0.

-This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: GNU General Public License, version 2 with the GNU Classpath Exception [1] and GNU General Public License, version 2 with the OpenJDK Assembly Exception [2]. +This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: GNU General Public License, version 2 with the GNU Classpath Exception [1] and GNU General Public License, version 2 with the OpenJDK Assembly Exception [2].

-[1] https://www.gnu.org/software/classpath/license.html +[1] https://www.gnu.org/software/classpath/license.html
[2] http://openjdk.java.net/legal/assembly-exception.html
@@ -151,7 +151,7 @@ NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, IN

COPYRIGHT AND PERMISSION NOTICE

-Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. +Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.

Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.

@@ -238,7 +238,7 @@ distribution. musl 1.1.4 c

-Copyright © 2005-2014 Rich Felker, et al. +Copyright © 2005-2014 Rich Felker, et al.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/java/lib/server/libjvm.so b/java/lib/server/libjvm.so index ac0e6f9..130fa76 100644 Binary files a/java/lib/server/libjvm.so and b/java/lib/server/libjvm.so differ diff --git a/minecraft-server.jar b/minecraft-server.jar index 50f6031..d999fc7 100644 Binary files a/minecraft-server.jar and b/minecraft-server.jar differ diff --git a/plugins/Essentials.jar b/plugins/Essentials.jar index 82ce280..940910b 100644 Binary files a/plugins/Essentials.jar and b/plugins/Essentials.jar differ diff --git a/plugins/Extras.jar b/plugins/Extras.jar index 50948fe..a3f7764 100644 Binary files a/plugins/Extras.jar and b/plugins/Extras.jar differ diff --git a/plugins/FastAsyncWorldEdit.jar b/plugins/FastAsyncWorldEdit.jar old mode 100755 new mode 100644 index 3948937..f381bbf Binary files a/plugins/FastAsyncWorldEdit.jar and b/plugins/FastAsyncWorldEdit.jar differ diff --git a/plugins/FastAsyncWorldEdit/config.yml b/plugins/FastAsyncWorldEdit/config.yml index 6f38767..8e6c85a 100644 --- a/plugins/FastAsyncWorldEdit/config.yml +++ b/plugins/FastAsyncWorldEdit/config.yml @@ -147,7 +147,7 @@ queue: # Loading the right amount of chunks beforehand can speed up operations # - Low values may result in FAWE waiting on requests to the main thread # - Higher values use more memory and isn't noticeably faster - preload-chunks: 32 + preload-chunks: 1 # Discard edits which have been idle for a certain amount of time (ms) # - E.g. A plugin creates an EditSession but never does anything with it # - This only applies to plugins improperly using WorldEdit's legacy API diff --git a/plugins/ViaBackwards.jar b/plugins/ViaBackwards.jar index 5ee8f4d..fee2f86 100644 Binary files a/plugins/ViaBackwards.jar and b/plugins/ViaBackwards.jar differ diff --git a/plugins/ViaVersion.jar b/plugins/ViaVersion.jar index cebee48..ed582b2 100644 Binary files a/plugins/ViaVersion.jar and b/plugins/ViaVersion.jar differ