Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hologram bugfixes

This commit is contained in:
fullwall 2020-08-11 22:47:45 +08:00
parent 2f6395884a
commit 45907da2d7
9 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
View File

@ -81,7 +81,7 @@ public class HologramTrait extends Trait {
private double getMaxHeight() {
return (lineHeight == -1 ? Setting.DEFAULT_NPC_HOLOGRAM_LINE_HEIGHT.asDouble() : lineHeight)
* (lines.size() + (npc.requiresNameHologram() ? 0 : -1));
* (lines.size() + (npc.requiresNameHologram() ? 0 : 1));
}
private void load() {

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
@ -233,7 +232,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
@ -264,7 +263,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}

3
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
View File

@ -7,7 +7,6 @@ import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
@ -284,7 +283,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}

3
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
View File

@ -7,7 +7,6 @@ import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
@ -263,7 +262,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}

3
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
@ -254,7 +253,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}

3
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
@ -232,7 +231,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}

3
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/EntityHumanNPC.java
View File

@ -8,7 +8,6 @@ import java.util.Map;
import java.util.function.Consumer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
@ -246,7 +245,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}

3
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java
View File

@ -5,7 +5,6 @@ import java.net.Socket;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
@ -234,7 +233,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
public String getSkinName() {
String skinName = npc.getTrait(SkinTrait.class).getSkinName();
if (skinName == null) {
skinName = ChatColor.stripColor(getName());
skinName = npc.getName();
}
return skinName.toLowerCase();
}