mirror of
https://github.com/YouHaveTrouble/NotJustNameplates.git
synced 2026-05-12 06:26:58 +00:00
vanishnopacket hook and set correct load order
This commit is contained in:
@@ -20,15 +20,14 @@ public final class NotJustNameplates extends JavaPlugin {
|
||||
private final TeamManager teamManager = new TeamManager();
|
||||
private NameplateManager nameplateManager = null;
|
||||
|
||||
private static boolean papiHook, superVanishHook = false;
|
||||
private static boolean papiHook, superVanishHook, vanishNoPacketHook = false;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
instance = this;
|
||||
|
||||
config = new NJNConfig(this);
|
||||
papiHook = Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null && Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
|
||||
superVanishHook = Bukkit.getPluginManager().isPluginEnabled("SuperVanish") || Bukkit.getPluginManager().isPluginEnabled("PremiumVanish");
|
||||
checkHooks();
|
||||
|
||||
DefaultPermissions.registerPermission("notjustnameplates.seeown", "Allows a player to see their own nameplate", PermissionDefault.FALSE);
|
||||
DefaultPermissions.registerPermission("notjustnameplates.command", "Allows a player to use the /njn command", PermissionDefault.TRUE);
|
||||
@@ -57,7 +56,7 @@ public final class NotJustNameplates extends JavaPlugin {
|
||||
|
||||
public void reloadPluginConfig() {
|
||||
config = new NJNConfig(this);
|
||||
papiHook = Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null && Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
|
||||
checkHooks();
|
||||
nameplateManager.reloadNameplates();
|
||||
updateNameplatesBasedOnPermission();
|
||||
}
|
||||
@@ -82,6 +81,12 @@ public final class NotJustNameplates extends JavaPlugin {
|
||||
return config.getDisplayContent("default");
|
||||
}
|
||||
|
||||
private void checkHooks() {
|
||||
papiHook = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
|
||||
superVanishHook = Bukkit.getPluginManager().isPluginEnabled("SuperVanish") || Bukkit.getPluginManager().isPluginEnabled("PremiumVanish");
|
||||
vanishNoPacketHook = Bukkit.getPluginManager().isPluginEnabled("VanishNoPacket");
|
||||
}
|
||||
|
||||
public TeamManager getTeamManager() {
|
||||
return teamManager;
|
||||
}
|
||||
@@ -109,4 +114,8 @@ public final class NotJustNameplates extends JavaPlugin {
|
||||
public static boolean isSuperVanishHooked() {
|
||||
return superVanishHook;
|
||||
}
|
||||
|
||||
public static boolean isVanishNoPacketHooked() {
|
||||
return vanishNoPacketHook;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,9 @@ import org.bukkit.util.Transformation;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.joml.AxisAngle4f;
|
||||
import org.joml.Vector3f;
|
||||
import org.kitteh.vanish.VanishCheck;
|
||||
import org.kitteh.vanish.VanishPlugin;
|
||||
import org.kitteh.vanish.staticaccess.VanishNoPacket;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@@ -154,6 +157,14 @@ public class Nameplate {
|
||||
return;
|
||||
}
|
||||
|
||||
if (NotJustNameplates.isVanishNoPacketHooked()) {
|
||||
VanishPlugin vanishPlugin = (VanishPlugin) Bukkit.getPluginManager().getPlugin("VanishNoPacket");
|
||||
if (vanishPlugin != null && vanishPlugin.getManager().isVanished(player)) {
|
||||
remove();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
createDisplayEntity();
|
||||
if (textDisplay == null || textDisplay.isDead()) return;
|
||||
if (!player.getPassengers().contains(textDisplay)) {
|
||||
|
||||
@@ -12,3 +12,10 @@ dependencies:
|
||||
required: false
|
||||
- name: PremiumVanish
|
||||
required: false
|
||||
- name: VanishNoPacket
|
||||
required: false
|
||||
load-after:
|
||||
- name: PlaceholderAPI
|
||||
- name: SuperVanish
|
||||
- name: PremiumVanish
|
||||
- name: VanishNoPacket
|
||||
Reference in New Issue
Block a user