Fix shulker color setting

CitizensDev · Mar 1, 2020 · 95ab688 · 95ab688
1 parent 225ede0
commit 95ab688
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 71 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -346,11 +346,8 @@ public void update() {
                     updateCustomName();
                 }
                 String nameplateVisible = data().<Object> get(NPC.NAMEPLATE_VISIBLE_METADATA, true).toString();
-                if (nameplateVisible.equals("hover")) {
-                    ((LivingEntity) getEntity()).setCustomNameVisible(false);
-                } else {
-                    ((LivingEntity) getEntity()).setCustomNameVisible(Boolean.parseBoolean(nameplateVisible));
-                }
+                ((LivingEntity) getEntity()).setCustomNameVisible(Boolean.parseBoolean(nameplateVisible));
+
                 if (data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
                     NMS.setKnockbackResistance((LivingEntity) getEntity(), 1D);
                 } else {
@@ -408,7 +405,6 @@ private void updateFlyableState() {
     }
 
     private static final SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create();
-
     private static final String NPC_METADATA_MARKER = "NPC";
     private static boolean SUPPORT_GLOWING = true;
     private static boolean SUPPORT_SILENT = true;

diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java b/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java
@@ -150,8 +150,9 @@ public void run() {
                     entity.getSkinTracker().notifyRemovePacketSent(entry.player.getUniqueId());
                 }
 
-                if (sendAll)
+                if (sendAll) {
                     entryIterator.remove();
+                }
             }
         }
     }

diff --git a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
@@ -48,9 +48,7 @@ public void apply(Team team, boolean nameVisibility) {
             }
         }
 
-        if (SUPPORT_TEAM_SETOPTION)
-
-        {
+        if (SUPPORT_TEAM_SETOPTION) {
             try {
                 team.setOption(Option.NAME_TAG_VISIBILITY, nameVisibility ? OptionStatus.ALWAYS : OptionStatus.NEVER);
             } catch (NoSuchMethodError e) {

diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java
@@ -35,7 +35,7 @@ public void run() {
                 NMS.setPeekShulker(npc.getEntity(), peek);
                 lastPeekSet = peek;
             }
-            NMS.setShulkerColor((Shulker) npc.getEntity(), color);
+            ((Shulker) npc.getEntity()).setColor(color);
         }
     }
 

diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java
@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
@@ -402,10 +401,6 @@ public static void setShouldJump(org.bukkit.entity.Entity entity) {
         BRIDGE.setShouldJump(entity);
     }
 
-    public static void setShulkerColor(Entity entity, DyeColor color) {
-        BRIDGE.setShulkerColor(entity, color);
-    }
-
     public static void setSitting(Ocelot ocelot, boolean sitting) {
         BRIDGE.setSitting(ocelot, sitting);
     }

diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
@@ -3,7 +3,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -135,8 +134,6 @@ public interface NMSBridge {
 
     public void setShouldJump(Entity entity);
 
-    public void setShulkerColor(Entity entity, DyeColor color);
-
     public void setSitting(Ocelot ocelot, boolean sitting);
 
     public void setSitting(Tameable tameable, boolean sitting);

diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
@@ -920,10 +920,6 @@ public void setShouldJump(org.bukkit.entity.Entity entity) {
         }
     }
 
-    @Override
-    public void setShulkerColor(org.bukkit.entity.Entity entity, DyeColor color) {
-    }
-
     @Override
     public void setSitting(Ocelot ocelot, boolean sitting) {
         setSitting((Tameable) ocelot, sitting);

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
@@ -979,10 +979,6 @@ public void setShouldJump(org.bukkit.entity.Entity entity) {
         }
     }
 
-    @Override
-    public void setShulkerColor(org.bukkit.entity.Entity entity, DyeColor color) {
-    }
-
     @Override
     public void setSitting(Ocelot ocelot, boolean sitting) {
         setSitting((Tameable) ocelot, sitting);

diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
@@ -991,10 +991,6 @@ public void setShouldJump(org.bukkit.entity.Entity entity) {
         }
     }
 
-    @Override
-    public void setShulkerColor(org.bukkit.entity.Entity entity, DyeColor color) {
-    }
-
     @Override
     public void setSitting(Ocelot ocelot, boolean sitting) {
         setSitting((Tameable) ocelot, sitting);

diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
@@ -1026,10 +1026,6 @@ public void setShouldJump(org.bukkit.entity.Entity entity) {
         }
     }
 
-    @Override
-    public void setShulkerColor(org.bukkit.entity.Entity entity, DyeColor color) {
-    }
-
     @Override
     public void setSitting(Ocelot ocelot, boolean sitting) {
         setSitting((Tameable) ocelot, sitting);

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
@@ -1073,10 +1073,6 @@ public void setShouldJump(org.bukkit.entity.Entity entity) {
         }
     }
 
-    @Override
-    public void setShulkerColor(org.bukkit.entity.Entity entity, DyeColor color) {
-    }
-
     @Override
     public void setSitting(Ocelot ocelot, boolean sitting) {
         // sitting removed

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
@@ -197,29 +197,6 @@ public void enderTeleportTo(double d0, double d1, double d2) {
         }
     }
 
-    @Override
-    public void h(double x, double y, double z) {
-        if (npc == null) {
-            super.h(x, y, z);
-            return;
-        }
-        if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
-            if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
-                super.h(x, y, z);
-            }
-            return;
-        }
-        Vector vector = new Vector(x, y, z);
-        NPCPushEvent event = Util.callPushEvent(npc, vector);
-        if (!event.isCancelled()) {
-            vector = event.getCollisionVector();
-            super.h(vector.getX(), vector.getY(), vector.getZ());
-        }
-        // when another entity collides, this method is called to push the
-        // NPC so we prevent it from doing anything if the event is
-        // cancelled.
-    }
-
     @Override
     public CraftPlayer getBukkitEntity() {
         if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@@ -269,6 +246,29 @@ public SkinPacketTracker getSkinTracker() {
         return skinTracker;
     }
 
+    @Override
+    public void h(double x, double y, double z) {
+        if (npc == null) {
+            super.h(x, y, z);
+            return;
+        }
+        if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
+            if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
+                super.h(x, y, z);
+            }
+            return;
+        }
+        Vector vector = new Vector(x, y, z);
+        NPCPushEvent event = Util.callPushEvent(npc, vector);
+        if (!event.isCancelled()) {
+            vector = event.getCollisionVector();
+            super.h(vector.getX(), vector.getY(), vector.getZ());
+        }
+        // when another entity collides, this method is called to push the
+        // NPC so we prevent it from doing anything if the event is
+        // cancelled.
+    }
+
     private void initialise(MinecraftServer minecraftServer) {
         Socket socket = new EmptySocket();
         NetworkManager conn = null;

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
@@ -1079,10 +1079,6 @@ public void setShouldJump(org.bukkit.entity.Entity entity) {
         }
     }
 
-    @Override
-    public void setShulkerColor(org.bukkit.entity.Entity entity, DyeColor color) {
-    }
-
     @Override
     public void setSitting(Ocelot ocelot, boolean sitting) {
         // sitting removed

diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
@@ -16,7 +16,6 @@
 import java.util.Set;
 
 import org.bukkit.Bukkit;
-import org.bukkit.DyeColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -858,10 +857,6 @@ public void setShouldJump(org.bukkit.entity.Entity entity) {
         }
     }
 
-    @Override
-    public void setShulkerColor(org.bukkit.entity.Entity entity, DyeColor color) {
-    }
-
     @Override
     public void setSitting(Ocelot ocelot, boolean sitting) {
         setSitting((Tameable) ocelot, sitting);