mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-05 09:39:56 +00:00
Code Issues Projects Releases Wiki Activity

"Fixed" FloatingTextParticle yet again

Browse Source 
- nametag visibility flags don't work properly, only players show them all the time
- invisibility overrides nametag visibility
- scale 0 triggers asserts on debug builds

..... how hard is it to NOT break these simple things each update Mojang?

closes #1205
This commit is contained in:
Dylan K. Taylor 2017-09-21 19:04:45 +01:00
parent 10f6a0eef0
commit 9bd7f771d3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pocketmine/level/particle/FloatingTextParticle.php
View File

@ -25,9 +25,13 @@ namespace pocketmine\level\particle;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\entity\Item as ItemEntity; use pocketmine\entity\Item as ItemEntity;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\mcpe\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\utils\UUID;
class FloatingTextParticle extends Particle{ class FloatingTextParticle extends Particle{
//TODO: HACK! //TODO: HACK!
@ -77,13 +81,13 @@ class FloatingTextParticle extends Particle{
} }
if(!$this->invisible){ if(!$this->invisible){
$pk = new AddPlayerPacket();
$pk = new AddEntityPacket(); $pk->uuid = UUID::fromRandom();
$pk->username = "";
$pk->entityRuntimeId = $this->entityId; $pk->entityRuntimeId = $this->entityId;
$pk->type = ItemEntity::NETWORK_ID; $pk->position = $this->asVector3(); //TODO: check offset
$pk->position = $this->asVector3()->subtract(0, 0.75, 0); $pk->item = ItemFactory::get(Item::AIR, 0, 0);
$pk->yaw = 0;
$pk->pitch = 0;
$flags = ( $flags = (
(1 << Entity::DATA_FLAG_CAN_SHOW_NAMETAG) | (1 << Entity::DATA_FLAG_CAN_SHOW_NAMETAG) |
(1 << Entity::DATA_FLAG_ALWAYS_SHOW_NAMETAG) | (1 << Entity::DATA_FLAG_ALWAYS_SHOW_NAMETAG) |
@ -91,7 +95,8 @@ class FloatingTextParticle extends Particle{
); );
$pk->metadata = [ $pk->metadata = [
Entity::DATA_FLAGS => [Entity::DATA_TYPE_LONG, $flags], Entity::DATA_FLAGS => [Entity::DATA_TYPE_LONG, $flags],
Entity::DATA_NAMETAG => [Entity::DATA_TYPE_STRING, $this->title . ($this->text !== "" ? "\n" . $this->text : "")] Entity::DATA_NAMETAG => [Entity::DATA_TYPE_STRING, $this->title . ($this->text !== "" ? "\n" . $this->text : "")],
Entity::DATA_SCALE => [Entity::DATA_TYPE_FLOAT, 0.01] //zero causes problems on debug builds
]; ];
$p[] = $pk; $p[] = $pk;