From 1f9965b13a54c39a8849d005a81fdccb5d40d658 Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 1 Jan 2020 02:34:59 -0500 Subject: [PATCH] Fixed NPE Throwing From Console Disband --- .../massivecraft/factions/zcore/persist/MemoryFaction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java index 3ca4f014..5ff32f9f 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java @@ -339,7 +339,11 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { public void disband(Player disbander, PlayerDisbandReason reason) { boolean disbanderIsConsole = disbander == null; - FPlayer fdisbander = FPlayers.getInstance().getByOfflinePlayer(disbander); + FPlayer fdisbander = null; + if(!disbanderIsConsole){ + fdisbander= FPlayers.getInstance().getByOfflinePlayer(disbander); + } + FactionDisbandEvent disbandEvent = new FactionDisbandEvent(disbander, this.getId(), reason); Bukkit.getServer().getPluginManager().callEvent(disbandEvent);