mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-11 04:17:48 +00:00
Code Issues Projects Releases Wiki Activity

hacks for NPC and floating text

Browse Source 
I didn't think mojang could break this fucking game any worse
This commit is contained in:
Dylan K. Taylor 2018-07-11 19:45:48 +01:00
parent b5dcdea6d8
commit 4a5ff32d2e
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/entity/Human.php
View File

@ -49,7 +49,9 @@ use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\mcpe\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\network\mcpe\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\mcpe\protocol\PlayerSkinPacket; use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\utils\UUID; use pocketmine\utils\UUID;
@ -798,6 +800,14 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
throw new \InvalidStateException((new \ReflectionClass($this))->getShortName() . " must have a valid skin set"); throw new \InvalidStateException((new \ReflectionClass($this))->getShortName() . " must have a valid skin set");
} }
if(!($this instanceof Player)){
/* we don't use Server->updatePlayerListData() because that uses batches, which could cause race conditions in async compression mode */
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_ADD;
$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $this->getName(), 0, $this->skin)];
$player->dataPacket($pk);
}
$pk = new AddPlayerPacket(); $pk = new AddPlayerPacket();
$pk->uuid = $this->getUniqueId(); $pk->uuid = $this->getUniqueId();
$pk->username = $this->getName(); $pk->username = $this->getName();
@ -816,7 +826,10 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$this->armorInventory->sendContents($player); $this->armorInventory->sendContents($player);
if(!($this instanceof Player)){ if(!($this instanceof Player)){
$this->sendSkin([$player]); $pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_REMOVE;
$pk->entries = [PlayerListEntry::createRemovalEntry($this->uuid)];
$player->dataPacket($pk);
} }
} }

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

@ -29,8 +29,9 @@ use pocketmine\item\Item;
use pocketmine\item\ItemFactory; use pocketmine\item\ItemFactory;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\mcpe\protocol\PlayerSkinPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\mcpe\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
use pocketmine\utils\UUID; use pocketmine\utils\UUID;
class FloatingTextParticle extends Particle{ class FloatingTextParticle extends Particle{
@ -89,9 +90,17 @@ class FloatingTextParticle extends Particle{
} }
if(!$this->invisible){ if(!$this->invisible){
$uuid = UUID::fromRandom();
$name = $this->title . ($this->text !== "" ? "\n" . $this->text : "");
$add = new PlayerListPacket();
$add->type = PlayerListPacket::TYPE_ADD;
$add->entries = [PlayerListEntry::createAdditionEntry($uuid, $this->entityId, $name, $name, 0, new Skin("Standard_Custom", str_repeat("\x00", 8192)))];
$p[] = $add;
$pk = new AddPlayerPacket(); $pk = new AddPlayerPacket();
$pk->uuid = $uuid = UUID::fromRandom(); $pk->uuid = $uuid;
$pk->username = $this->title . ($this->text !== "" ? "\n" . $this->text : ""); $pk->username = $name;
$pk->entityRuntimeId = $this->entityId; $pk->entityRuntimeId = $this->entityId;
$pk->position = $this->asVector3(); //TODO: check offset $pk->position = $this->asVector3(); //TODO: check offset
$pk->item = ItemFactory::get(Item::AIR, 0, 0); $pk->item = ItemFactory::get(Item::AIR, 0, 0);
@ -106,10 +115,10 @@ class FloatingTextParticle extends Particle{
$p[] = $pk; $p[] = $pk;
$skinPk = new PlayerSkinPacket(); $remove = new PlayerListPacket();
$skinPk->uuid = $uuid; $remove->type = PlayerListPacket::TYPE_REMOVE;
$skinPk->skin = new Skin("Standard_Custom", str_repeat("\x00", 8192)); $remove->entries = [PlayerListEntry::createRemovalEntry($uuid)];
$p[] = $skinPk; $p[] = $remove;
} }
return $p; return $p;