Merge pull request DevotedMC#33 from Diet-Cola/anvil-fix

Use pearlApi vs getInstance
Diet-Cola · Jul 13, 2022 · dac2f00 · dac2f00
2 parents 4afc47d + be175c1
commit dac2f00
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/paper/src/main/java/com/devotedmc/ExilePearl/ExilePearlPlugin.java b/paper/src/main/java/com/devotedmc/ExilePearl/ExilePearlPlugin.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
@@ -20,8 +19,6 @@
  */
 public final class ExilePearlPlugin extends JavaPlugin {
 
-	private static ExilePearlPlugin instance;
-
 	private static ExilePearlApi core;
 
 	public static ExilePearlApi getApi() {
@@ -38,10 +35,6 @@ protected ExilePearlPlugin(final JavaPluginLoader loader, final PluginDescriptio
 		core = CorePluginFactory.createCore(this);
     }
 
-	public static Plugin getInstance() {
-		return instance;
-	}
-
 	@Override
 	public void onLoad() { 
 		core.onLoad();

diff --git a/paper/src/main/java/com/devotedmc/ExilePearl/core/CoreExilePearl.java b/paper/src/main/java/com/devotedmc/ExilePearl/core/CoreExilePearl.java
@@ -482,7 +482,9 @@ public boolean equals(final Object o) {
 	public void performBroadcast() {
 		Location l = getHolder().getLocation();
 		String name = getHolder().getName();
-		getPlayer().sendMessage(ChatUtils.parseColor(String.format(Lang.pearlPearlIsHeld, name, l.getBlockX(), l.getBlockY(), l.getBlockZ(), l.getWorld().getName())));
+		if (getPlayer() != null) {
+			getPlayer().sendMessage(ChatUtils.parseColor(String.format(Lang.pearlPearlIsHeld, name, l.getBlockX(), l.getBlockY(), l.getBlockZ(), l.getWorld().getName())));
+		}
 		for(BroadcastListener b : bcastListeners) {
 			b.broadcast(this);
 		}

diff --git a/paper/src/main/java/com/devotedmc/ExilePearl/listener/PlayerListener.java b/paper/src/main/java/com/devotedmc/ExilePearl/listener/PlayerListener.java
@@ -2,7 +2,6 @@
 
 import com.devotedmc.ExilePearl.ExilePearl;
 import com.devotedmc.ExilePearl.ExilePearlApi;
-import com.devotedmc.ExilePearl.ExilePearlPlugin;
 import com.devotedmc.ExilePearl.ExileRule;
 import com.devotedmc.ExilePearl.Lang;
 import com.devotedmc.ExilePearl.PearlFreeReason;
@@ -140,7 +139,7 @@ public void disablePearlAnvil(final PrepareAnvilEvent event) {
 			}
 			event.setResult(null);
 			// This is needed because of client side shenanigans
-			Bukkit.getScheduler().runTaskLater(ExilePearlPlugin.getInstance(), () -> {
+			Bukkit.getScheduler().runTaskLater(pearlApi, () -> {
 				for (final Player viewer : InventoryUtils.getViewingPlayers(inventory)) {
 					viewer.updateInventory();
 				}