add pmmp#5122

README.md

@@ -33,6 +33,8 @@ Additions
 > https://github.com/pmmp/PocketMine-MP/pull/4687 
 > https://github.com/pmmp/PocketMine-MP/pull/4715
 > https://github.com/pmmp/PocketMine-MP/pull/4742
+> https://github.com/pmmp/PocketMine-MP/pull/5095
+> https://github.com/pmmp/PocketMine-MP/pull/5122
 
 
 ## What is this?

src/entity/Entity.php

@@ -90,6 +90,7 @@ abstract class Entity{
 	private const TAG_FALL_DISTANCE = "FallDistance"; //TAG_Float
 	private const TAG_CUSTOM_NAME = "CustomName"; //TAG_String
 	private const TAG_CUSTOM_NAME_VISIBLE = "CustomNameVisible"; //TAG_Byte
+	private const TAG_CUSTOM_NAME_ALWAYS_VISIBLE = "CustomNameAlwaysVisible"; //TAG_Byte
 	public const TAG_POS = "Pos"; //TAG_List<TAG_Double>|TAG_List<TAG_Float>
 	public const TAG_MOTION = "Motion"; //TAG_List<TAG_Double>|TAG_List<TAG_Float>
 	public const TAG_ROTATION = "Rotation"; //TAG_List<TAG_Float>
@@ -492,6 +493,7 @@ public function saveNBT() : CompoundTag{
 			if($this->getNameTag() !== ""){
 				$nbt->setString(self::TAG_CUSTOM_NAME, $this->getNameTag());
 				$nbt->setByte(self::TAG_CUSTOM_NAME_VISIBLE, $this->isNameTagVisible() ? 1 : 0);
+				$nbt->setByte(self::TAG_CUSTOM_NAME_ALWAYS_VISIBLE, $this->isNameTagAlwaysVisible() ? 1 : 0);
 			}
 		}
 
@@ -520,6 +522,8 @@ protected function initEntity(CompoundTag $nbt) : void{
 			}else{
 				$this->setNameTagVisible($nbt->getByte(self::TAG_CUSTOM_NAME_VISIBLE, 1) !== 0);
 			}
+
+			$this->setNameTagAlwaysVisible($nbt->getByte(self::TAG_CUSTOM_NAME_ALWAYS_VISIBLE, 0) !== 0);
 		}
 	}