From 0723620722dfafe1cb663cf0437eb2578efb6ed3 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Wed, 12 Feb 2020 17:09:28 -0500 Subject: [PATCH] Remove remaining BlocksHub references from the code. --- .../com/boydti/fawe/bukkit/FaweBukkit.java | 23 ++----------------- .../src/main/java/com/boydti/fawe/IFawe.java | 2 -- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java index 616aff519..8d2ff4daf 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java @@ -5,7 +5,6 @@ import com.boydti.fawe.IFawe; import com.boydti.fawe.beta.implementation.cache.preloader.AsyncPreloader; import com.boydti.fawe.beta.implementation.cache.preloader.Preloader; import com.boydti.fawe.beta.implementation.queue.QueueHandler; -import com.boydti.fawe.bukkit.regions.plotsquared.PlotSquaredFeature; import com.boydti.fawe.bukkit.adapter.BukkitQueueHandler; import com.boydti.fawe.bukkit.listener.BrushListener; import com.boydti.fawe.bukkit.listener.BukkitImageListener; @@ -31,7 +30,6 @@ import com.boydti.fawe.util.WEManager; import com.boydti.fawe.util.image.ImageViewer; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitPlayer; -import com.sk89q.worldedit.world.World; import io.papermc.lib.PaperLib; import java.io.File; import java.io.FileOutputStream; @@ -166,12 +164,10 @@ public class FaweBukkit implements IFawe, Listener { Player player = null; if (obj.getClass() == Player.class) { player = (Player) obj; - } - else if (obj.getClass() == String.class) { + } else if (obj.getClass() == String.class) { String name = (String) obj; player = Bukkit.getPlayer(name); - } - else if (obj.getClass() == UUID.class) { + } else if (obj.getClass() == UUID.class) { UUID uuid = (UUID) obj; player = Bukkit.getPlayer(uuid); } @@ -321,21 +317,6 @@ public class FaweBukkit implements IFawe, Listener { return Bukkit.getOfflinePlayer(uuid).getName(); } - private boolean enabledBlocksHub = true; - - @Override - public Object getBlocksHubApi() { - if (!enabledBlocksHub) { - return null; - } - Plugin blocksHubPlugin = Bukkit.getPluginManager().getPlugin("BlocksHub"); - if (blocksHubPlugin == null) { - enabledBlocksHub = false; - return null; - } - return null; - } - @Override public Preloader getPreloader() { if (PaperLib.isPaper()) { diff --git a/worldedit-core/src/main/java/com/boydti/fawe/IFawe.java b/worldedit-core/src/main/java/com/boydti/fawe/IFawe.java index b2786538d..0374687d8 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/IFawe.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/IFawe.java @@ -37,8 +37,6 @@ public interface IFawe { String getName(UUID uuid); - Object getBlocksHubApi(); - default String getDebugInfo() { return ""; }