Fix #638, and make setCustomNameVisible work for setNameVisible, I should really fix permissions for this.
This commit is contained in:
parent
49fe9d51f0
commit
0ce85946a0
@ -868,6 +868,11 @@ public abstract class Disguise {
|
||||
getWatcher().setBackupValue(flag, backup == null ? null : backup.getDefault());
|
||||
}
|
||||
|
||||
if (getEntity() instanceof Player && !getWatcher().hasCustomName()) {
|
||||
getWatcher().setInteralCustomName("");
|
||||
getWatcher().setInternalCustomNameVisible(false);
|
||||
}
|
||||
|
||||
// If a horse is disguised as a horse, it should obey parent no gravity rule
|
||||
if ((getEntity() instanceof Boat || getEntity() instanceof AbstractHorse) &&
|
||||
(getWatcher() instanceof BoatWatcher || getWatcher() instanceof AbstractHorseWatcher)) {
|
||||
|
@ -707,10 +707,19 @@ public class FlagWatcher {
|
||||
}
|
||||
|
||||
public void setCustomNameVisible(boolean display) {
|
||||
if (getDisguise().isPlayerDisguise()) {
|
||||
((PlayerDisguise) getDisguise()).setNameVisible(display);
|
||||
return;
|
||||
}
|
||||
|
||||
if (DisguiseConfig.isArmorstandsName() && DisguiseConfig.isOverrideCustomNames()) {
|
||||
display = false;
|
||||
}
|
||||
|
||||
setInternalCustomNameVisible(display);
|
||||
}
|
||||
|
||||
protected void setInternalCustomNameVisible(boolean display) {
|
||||
setData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE, display);
|
||||
sendData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE);
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ import com.comphenix.protocol.wrappers.WrappedGameProfile;
|
||||
import com.comphenix.protocol.wrappers.nbt.NbtCompound;
|
||||
import com.comphenix.protocol.wrappers.nbt.NbtFactory;
|
||||
import me.libraryaddict.disguise.DisguiseConfig;
|
||||
import me.libraryaddict.disguise.LibsDisguises;
|
||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||
import me.libraryaddict.disguise.disguisetypes.MetaIndex;
|
||||
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
|
||||
@ -19,9 +20,6 @@ public class PlayerWatcher extends LivingWatcher {
|
||||
|
||||
setData(MetaIndex.PLAYER_SKIN, MetaIndex.PLAYER_SKIN.getDefault());
|
||||
setData(MetaIndex.PLAYER_HAND, (byte) 1); // I may be left handed, but the others are right
|
||||
|
||||
setInteralCustomName("");
|
||||
setCustomNameVisible(false);
|
||||
}
|
||||
|
||||
public boolean isDisplayedInTab() {
|
||||
|
Loading…
Reference in New Issue
Block a user