Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 12:35:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Titles can be used on Spigot and Paper now

Browse Source
This commit is contained in:
MattBDev 2019-05-13 18:20:58 -04:00
parent 549a4df834
commit adefe2eeef
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
View File

@ -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] DOWNLOAD: https://papermc.io/downloads");
System.out.println("[P2] GUIDE: https://www.spigotmc.org/threads/21726/"); 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] 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 System.out
.println("[P2] ==============================================================="); .println("[P2] ===============================================================");
} }
@ -720,11 +720,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
wrapper = new DefaultUUIDWrapper(); wrapper = new DefaultUUIDWrapper();
Settings.UUID.OFFLINE = false; Settings.UUID.OFFLINE = false;
} }
if (Bukkit.getVersion().contains("git-Spigot")) { 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 (wrapper instanceof DefaultUUIDWrapper if (wrapper instanceof DefaultUUIDWrapper
|| wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) { || wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
Settings.UUID.NATIVE_UUID_PROVIDER = true; Settings.UUID.NATIVE_UUID_PROVIDER = true;
@ -787,13 +783,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
} }
@Override public AbstractTitle initTitleManager() { @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(); return new DefaultTitle();
} }

8
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
View File

@ -3,17 +3,13 @@ package com.github.intellectualsites.plotsquared.bukkit.titles;
import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle; import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class DefaultTitle extends AbstractTitle { public class DefaultTitle extends AbstractTitle {
@Override @Override
public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) { public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
//Titles are now a Paper Exclusive feature. final Player playerObj = ((BukkitPlayer) player).player;
if (Bukkit.getVersion().contains("git-Paper")) { playerObj.sendTitle(head, sub, in, delay, out);
final Player playerObj = ((BukkitPlayer) player).player;
playerObj.sendTitle(head, sub, in, delay, out);
}
} }
} }

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
View File

@ -27,9 +27,9 @@ public class Settings extends Config {
@Final public static String PLATFORM; // These values are set from P2 before loading @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("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`"}) "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 @Create // This value will be generated automatically
public static ConfigBlock<Auto_Clear> AUTO_CLEAR = null; public static ConfigBlock<Auto_Clear> AUTO_CLEAR = null;