Skip to content

Commit

Permalink
Update dockerfiles
Browse files Browse the repository at this point in the history
Signed-off-by: Ashcon Partovi <[email protected]>
  • Loading branch information
Electroid committed Oct 9, 2020
1 parent 3ec4880 commit 35a2e6a
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
branches:
- dev
repository_dispatch:
schedule:
- cron: 0 1 * * *
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
9 changes: 6 additions & 3 deletions core/src/main/java/tc/oc/pgm/PGMPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions docs/RUNNING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.2.0</version>
<version>2.6.0</version>
<configuration>
<from>
<image>shipilev/openjdk-shenandoah:8</image>
Expand Down
Binary file removed server/sportpaper.jar
Binary file not shown.
Binary file modified server/src/main/jib/server/plugins/viarewind.jar
Binary file not shown.
Binary file modified server/src/main/jib/server/plugins/viaversion.jar
Binary file not shown.
Binary file modified server/src/main/jib/server/server-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 35a2e6a

Please sign in to comment.