Check for existence of mcMMO Overhaul party. Bump version

PikaMug · Oct 12, 2021 · 7e5c0c7 · 7e5c0c7
1 parent 107f33c
commit 7e5c0c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.pikamug.unite</groupId>
     <artifactId>Unite</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/me/pikamug/unite/Unite.java b/src/main/java/me/pikamug/unite/Unite.java
@@ -55,7 +55,7 @@ public static Unite getInstance() {
     public void hookProviders() {
         hookProvider("Parties", PartyProvider_Parties.class, ServicePriority.Highest, "com.alessiodp.parties.api.interfaces.PartiesAPI");
         hookProvider("DungeonsXL", PartyProvider_DungeonsXL.class, ServicePriority.Normal, "de.erethon.dungeonsxl.DungeonsXL");
-        hookProvider("mcMMO", PartyProvider_mcMMO.class, ServicePriority.High, "com.gmail.nossr50.party.PartyManager"); //TODO might not work
+        hookProvider("mcMMO", PartyProvider_mcMMO.class, ServicePriority.High, "com.gmail.nossr50.party.PartyManager");
     }
 
     private void hookProvider(String name, Class<? extends PartyProvider> hookClass, ServicePriority priority, String...packages) {

diff --git a/src/main/java/me/pikamug/unite/api/objects/plugins/PartyProvider_mcMMO.java b/src/main/java/me/pikamug/unite/api/objects/plugins/PartyProvider_mcMMO.java
@@ -129,7 +129,10 @@ public boolean areInSameParty(UUID playerId1, UUID playerId2) {
 
     @Override
     public String getPartyName(UUID playerId) {
-        return PartyManager.getParty(Bukkit.getPlayer(playerId)).getName();
+        if (PartyManager.getParty(Bukkit.getPlayer(playerId)) != null) {
+            return PartyManager.getParty(Bukkit.getPlayer(playerId)).getName();
+        }
+        return null;
     }
 
     @Override