Add always-use-name-holograms

CitizensDev · Jul 18, 2020 · c8898b5 · c8898b5
1 parent b571deb
commit c8898b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java
@@ -57,6 +57,7 @@ private void updateMessagingSettings() {
     }
 
     public enum Setting {
+        ALWAYS_USE_NAME_HOLOGRAM("npc.always-use-name-holograms", false),
         ASTAR_ITERATIONS_PER_TICK("npc.pathfinding.new-finder.iterations-per-tick", 5000),
         AUTH_SERVER_URL("general.authlib.profile-url", "https://sessionserver.mojang.com/session/minecraft/profile/"),
         CHAT_BYSTANDERS_HEAR_TARGETED_CHAT("npc.chat.options.bystanders-hear-targeted-chat", true),

diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -168,6 +168,11 @@ public void load(final DataKey root) {
         navigator.load(root.getRelative("navigator"));
     }
 
+    @Override
+    public boolean requiresNameHologram() {
+        return super.requiresNameHologram() || Setting.ALWAYS_USE_NAME_HOLOGRAM.asBoolean();
+    }
+
     private void resetCachedCoord() {
         if (cachedCoord == null)
             return;