diff --git a/.github/workflows/compile_snapshot.yml b/.github/workflows/compile_snapshot.yml index 585ec68d0..3405ba91d 100644 --- a/.github/workflows/compile_snapshot.yml +++ b/.github/workflows/compile_snapshot.yml @@ -14,9 +14,9 @@ jobs: name: development url: https://repo.andrei1058.dev steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '19.0.2+7' distribution: 'adopt' diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e6e6985b..a55e8fc42 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,9 +11,9 @@ jobs: name: production url: https://repo.andrei1058.com steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '19.0.2+7' distribution: 'adopt' diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index 9fd07c10f..a736953be 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -13,9 +13,9 @@ jobs: name: development url: https://repo.andrei1058.dev steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '19.0.2+7' distribution: 'adopt' diff --git a/bedwars-plugin/pom.xml b/bedwars-plugin/pom.xml index a108a7702..07104ed6c 100644 --- a/bedwars-plugin/pom.xml +++ b/bedwars-plugin/pom.xml @@ -94,13 +94,13 @@ org.bstats bstats-bukkit - 3.0.1 + 3.0.2 true de.simonsator DevelopmentPAFSpigot - 1.0.67 + 1.0.239 provided @@ -206,7 +206,7 @@ me.clip placeholderapi - 2.11.2 + 2.11.3 provided @@ -219,7 +219,7 @@ commons-io commons-io - 2.11.0 + 2.13.0 true @@ -239,7 +239,7 @@ org.slf4j slf4j-simple - 2.0.6 + 2.0.7 true @@ -341,7 +341,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.0 diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAF.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAF.java index 0cb8765fd..d4f14a042 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAF.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAF.java @@ -14,6 +14,7 @@ public class PAF implements Party { //Party and Friends for Spigot Support by JT122406 private PlayerParty getPAFParty(Player p) { + if (PAFPlayerManager.getInstance() == null) return null; return PartyManager.getInstance().getParty(PAFPlayerManager.getInstance().getPlayer(p)); } diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAFBungeecordRedisApi.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAFBungeecordRedisApi.java index b6fd5ed77..fb1c93468 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAFBungeecordRedisApi.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/party/PAFBungeecordRedisApi.java @@ -16,6 +16,7 @@ public class PAFBungeecordRedisApi implements Party { //Party and Friends Extended for BungeeCord Support by JT122406 private PlayerParty getPAFParty(Player p) { + if (PAFPlayerManager.getInstance() == null) return null; return PartyManager.getInstance().getParty(PAFPlayerManager.getInstance().getPlayer(p.getUniqueId())); } diff --git a/pom.xml b/pom.xml index 904ebdc36..f60d95297 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ commons-io commons-io - 2.11.0 + 2.13.0 provided diff --git a/versionsupport_v1_20_R1/pom.xml b/versionsupport_v1_20_R1/pom.xml index fd7042cd4..e8fdf7c71 100644 --- a/versionsupport_v1_20_R1/pom.xml +++ b/versionsupport_v1_20_R1/pom.xml @@ -35,7 +35,7 @@ org.spigotmc spigot - 1.20-R0.1-SNAPSHOT + 1.20.1-R0.1-SNAPSHOT jar provided