diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 63bdc2877f..abb6a2cc1c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,8 +4,6 @@ on: branches: - dev repository_dispatch: - schedule: - - cron: 0 1 * * * jobs: deploy: runs-on: ubuntu-latest diff --git a/core/src/main/java/tc/oc/pgm/PGMPlugin.java b/core/src/main/java/tc/oc/pgm/PGMPlugin.java index 81301f2dd4..bfa1814464 100644 --- a/core/src/main/java/tc/oc/pgm/PGMPlugin.java +++ b/core/src/main/java/tc/oc/pgm/PGMPlugin.java @@ -189,9 +189,12 @@ public void onEnable() { config.getGroups().isEmpty() ? null : new ConfigDecorationProvider()); // Sometimes match folders need to be cleaned up if the server previously crashed - for (File dir : getServer().getWorldContainer().listFiles()) { - if (dir.isDirectory() && dir.getName().startsWith("match")) { - FileUtils.delete(dir); + final File[] worldDirs = getServer().getWorldContainer().listFiles(); + if (worldDirs != null) { + for (File dir : worldDirs) { + if (dir.isDirectory() && dir.getName().startsWith("match")) { + FileUtils.delete(dir); + } } } diff --git a/docs/RUNNING.md b/docs/RUNNING.md index 8065ebb29b..3416e823c3 100644 --- a/docs/RUNNING.md +++ b/docs/RUNNING.md @@ -11,13 +11,13 @@ Installation cd /path/to/folder ``` -2. Download the latest version of [SportPaper](https://github.com/Electroid/SportPaper), a fork of the Minecraft 1.8 server. +2. Download the latest version of [SportPaper](https://pkg.ashcon.app/sportpaper), a fork of the Minecraft 1.8 server. ```bash curl https://pkg.ashcon.app/sportpaper -Lo sportpaper.jar curl https://pkg.ashcon.app/sportpaper-config -Lo sportpaper.yml ``` -3. Create a plugins folder and download the latest version of PGM. +3. Create a plugins folder and download the latest version of [PGM](https://pkg.ashcon.app/pgm). ```bash mkdir plugins curl https://pkg.ashcon.app/pgm -Lo plugins/pgm.jar diff --git a/pom.xml b/pom.xml index b201f10af0..f671e4d769 100644 --- a/pom.xml +++ b/pom.xml @@ -209,6 +209,7 @@ org.apache.maven.plugins maven-enforcer-plugin + 3.0.0-M3 enforce-versions diff --git a/server/pom.xml b/server/pom.xml index a923e87345..63c3136520 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -113,7 +113,7 @@ com.google.cloud.tools jib-maven-plugin - 2.2.0 + 2.6.0 shipilev/openjdk-shenandoah:8 diff --git a/server/sportpaper.jar b/server/sportpaper.jar deleted file mode 100644 index 9fd3476406..0000000000 Binary files a/server/sportpaper.jar and /dev/null differ diff --git a/server/src/main/jib/server/plugins/viarewind.jar b/server/src/main/jib/server/plugins/viarewind.jar index ca56bf2443..140a387e46 100644 Binary files a/server/src/main/jib/server/plugins/viarewind.jar and b/server/src/main/jib/server/plugins/viarewind.jar differ diff --git a/server/src/main/jib/server/plugins/viaversion.jar b/server/src/main/jib/server/plugins/viaversion.jar index c78765ec58..a368b9ec75 100644 Binary files a/server/src/main/jib/server/plugins/viaversion.jar and b/server/src/main/jib/server/plugins/viaversion.jar differ diff --git a/server/src/main/jib/server/server-icon.png b/server/src/main/jib/server/server-icon.png index e50ce3687b..31080deff1 100644 Binary files a/server/src/main/jib/server/server-icon.png and b/server/src/main/jib/server/server-icon.png differ