Merge branch 'sekwah41:spigot-1.13-1.16' into spigot-1.13-1.16

build.gradle

@@ -25,9 +25,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "org.apache.httpcomponents:httpmime:4.5.13"
-        classpath "com.google.code.gson:gson:2.9.1"
-        classpath "org.apache.httpcomponents:httpclient:4.5.13"
+        classpath "org.apache.httpcomponents:httpmime:4.5.14"
+        classpath "com.google.code.gson:gson:2.10.1"
+        classpath "org.apache.httpcomponents:httpclient:4.5.14"
     }
 }
 
@@ -92,10 +92,10 @@ dependencies {
     implementation "com.velocitypowered:velocity-api:3.1.1"
     annotationProcessor "com.velocitypowered:velocity-api:3.1.1"
 
-    implementation "io.netty:netty-all:4.1.82.Final"
+    implementation "io.netty:netty-all:4.1.87.Final"
     compileOnly 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT'
 
-    implementation "com.sk89q.worldedit:worldedit-bukkit:7.2.12"
+    implementation "com.sk89q.worldedit:worldedit-bukkit:7.2.13"
     //compile fileTree(dir: 'libs', include: ['*.jar'])
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java

@@ -55,6 +55,15 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
         ConfigAccessor config = new ConfigAccessor(plugin, "config.yml");
         ConfigAccessor portalConfig = new ConfigAccessor(plugin, "portals.yml");
         if (!(sender instanceof Player)) {
+            if(args.length == 1) {
+                if(args[0].equalsIgnoreCase("reload")) {
+                    Listeners.reloadValues(plugin);
+                    Portal.loadPortals();
+                    sender.sendMessage("portal reloaded.");
+
+                    return true;
+                }
+            }
             sender.sendMessage(PluginMessages.customPrefixFail + " You cannot use commands with the console.");
             return true;
         }

src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java

@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Plugin(id = "advancedportals", name = "Advanced Portals",
         url = "https://www.spigotmc.org/resources/advanced-portals.14356/",
+        authors = {"sekwah"},
         version = "0.9.2")
 public class AdvancedPortalsPlugin {
 

src/main/resources/bungee.yml

@@ -1,4 +1,4 @@
 main: com.sekwah.advancedportals.bungee.AdvancedPortalsPlugin
 name: AdvancedPortals
 version: 0.9.2
-author: sekwah41
+author: sekwah

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 main: com.sekwah.advancedportals.bukkit.AdvancedPortalsPlugin
 name: AdvancedPortals
 version: 0.9.2
-author: sekwah41
+author: sekwah
 description: An advanced portals plugin for bukkit.
 api-version: 1.13