Fix PAF Null issue (#853)

* Fix PAF Null issue * Update Github actions * Build 1.20 module against 1.20.1
andrei1058 · Oct 31, 2023 · 34976a6 · 34976a6
1 parent 61d922e
commit 34976a6
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -94,13 +94,13 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>de.simonsator</groupId>
             <artifactId>DevelopmentPAFSpigot</artifactId>
-            <version>1.0.67</version>
+            <version>1.0.239</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -206,7 +206,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
+            <version>2.11.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -219,7 +219,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.13.0</version>
             <optional>true</optional>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
@@ -239,7 +239,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
             <optional>true</optional>
         </dependency>
 
@@ -341,7 +341,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <relocations>
                         <relocation>

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
@@ -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
@@ -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
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.13.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/versionsupport_v1_20_R1/pom.xml b/versionsupport_v1_20_R1/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>