Disbander may not be player

PikaMug · Feb 18, 2022 · 2b781cf · 2b781cf
1 parent fafa2e8
commit 2b781cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/me/pikamug/unite/Unite.java b/src/main/java/me/pikamug/unite/Unite.java
@@ -57,7 +57,7 @@ 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");
-        hookProvider("SimpleCland", PartyProvider_SimpleClans.class, ServicePriority.Normal, "net.sacredlabyrinth.phaed.simpleclans.SimpleClans");
+        hookProvider("SimpleClans", PartyProvider_SimpleClans.class, ServicePriority.Normal, "net.sacredlabyrinth.phaed.simpleclans.SimpleClans");
     }
 
     private void hookProvider(String name, Class<? extends PartyProvider> hookClass, ServicePriority priority, String...packages) {

diff --git a/src/main/java/me/pikamug/unite/api/events/simpleclans/PartyDeleteEvent_SimpleClans.java b/src/main/java/me/pikamug/unite/api/events/simpleclans/PartyDeleteEvent_SimpleClans.java
@@ -3,10 +3,11 @@
 import me.pikamug.unite.api.events.PartyDeleteEvent;
 import me.pikamug.unite.api.objects.PartyProvider;
 import net.sacredlabyrinth.phaed.simpleclans.events.DisbandClanEvent;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
 import java.util.UUID;
 
 public class PartyDeleteEvent_SimpleClans extends PartyDeleteEvent {
@@ -31,6 +32,10 @@ public PartyDeleteEvent_SimpleClans(PartyProvider partyProvider, Event event, bo
 
     @Override
     public UUID getDisbander() {
-        return Objects.requireNonNull(event.getSender()).getUniqueId();
+        final CommandSender cs = event.getSender();
+        if (cs instanceof OfflinePlayer) {
+            return ((OfflinePlayer)cs).getUniqueId();
+        }
+        return null;
     }
 }