diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java index 986b2d4a4..94f6adcb7 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java @@ -146,7 +146,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain System.out.println("[P2] DOWNLOAD: https://papermc.io/downloads"); System.out.println("[P2] GUIDE: https://www.spigotmc.org/threads/21726/"); System.out.println("[P2] NOTE: This is only a recommendation"); - System.out.println("[P2] both Spigot and CraftBukkit are still supported (excluding titles)."); + System.out.println("[P2] both Spigot and CraftBukkit are still supported."); System.out .println("[P2] ==============================================================="); } @@ -720,11 +720,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain wrapper = new DefaultUUIDWrapper(); Settings.UUID.OFFLINE = false; } - if (Bukkit.getVersion().contains("git-Spigot")) { - PlotSquared.log(Captions.PREFIX - + " &c[WARN] Titles are Paper only feature. Titles will be disabled."); - Settings.TITLES = false; - } else { + if (!Bukkit.getVersion().contains("git-Spigot")) { if (wrapper instanceof DefaultUUIDWrapper || wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) { Settings.UUID.NATIVE_UUID_PROVIDER = true; @@ -787,13 +783,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } @Override public AbstractTitle initTitleManager() { - if (Bukkit.getVersion().contains("git-Spigot")) { - PlotSquared.log(Captions.PREFIX - + " &c[WARN] Titles are Paper only feature. Titles will be disabled."); - Settings.TITLES = false; - return null; - } - // Already initialized in UUID handler return new DefaultTitle(); } diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java index 0ec4a2c1f..e91f8bcae 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java +++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java @@ -3,17 +3,13 @@ package com.github.intellectualsites.plotsquared.bukkit.titles; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; public class DefaultTitle extends AbstractTitle { @Override public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) { - //Titles are now a Paper Exclusive feature. - if (Bukkit.getVersion().contains("git-Paper")) { - final Player playerObj = ((BukkitPlayer) player).player; - playerObj.sendTitle(head, sub, in, delay, out); - } + final Player playerObj = ((BukkitPlayer) player).player; + playerObj.sendTitle(head, sub, in, delay, out); } } diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java index 1743f1755..3c492583c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java @@ -27,9 +27,9 @@ public class Settings extends Config { @Final public static String PLATFORM; // These values are set from P2 before loading @Comment("Show additional information in console") public static boolean DEBUG = true; - @Comment({"[PAPER ONLY] The big annoying text that appears when you enter a plot", + @Comment({"The big annoying text that appears when you enter a plot", "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"}) - public static boolean TITLES = false; + public static boolean TITLES = true; @Create // This value will be generated automatically public static ConfigBlock AUTO_CLEAR = null;