From 4d24112ec7e8c6a8e14900f0b864b28abaa28e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Fri, 17 Jul 2020 23:06:40 +0200 Subject: [PATCH] Fix merge issues --- .../java/com/plotsquared/bukkit/util/BukkitUtil.java | 2 +- .../java/com/plotsquared/core/util/WorldUtil.java | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java index f945d2fad..1c989afe3 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -117,7 +117,7 @@ import java.util.stream.Stream; private static final Logger logger = LoggerFactory.getLogger("P2/" + BukkitUtil.class.getSimpleName()); - public static final BukkitAudiences BUKKIT_AUDIENCES = BukkitAudiences.create(BukkitMain.getPlugin(BukkitMain.class)); + public static final BukkitAudiences BUKKIT_AUDIENCES = BukkitAudiences.create(BukkitPlatform.getPlugin(BukkitPlatform.class)); public static final LegacyComponentSerializer LEGACY_COMPONENT_SERIALIZER = LegacyComponentSerializer.legacy(); public static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build(); diff --git a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java index d140cb9cf..2dd6e7a47 100644 --- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java @@ -194,18 +194,6 @@ public abstract class WorldUtil { @Deprecated @Nonnegative public abstract int getHighestBlockSynchronous(@Nonnull String world, int x, int z); - /** - * Set the text in a sign - * - * @param world World name - * @param x X coordinate - * @param y Y coordinate - * @param z Z coordinate - * @param lines Sign text - */ - public abstract void setSign(@Nonnull String world, int x, int y, int z, - @Nonnull String[] lines); - /** * Set the biome in a region *