Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/PT/PetsManager/PetsSession.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
namespace PT\PetsManager;

use pocketmine\entity\Entity;
use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\network\mcpe\protocol\AddActorPacket;
use pocketmine\network\mcpe\protocol\RemoveActorPacket;
use pocketmine\Server;
use pocketmine\Player;

Expand Down Expand Up @@ -52,10 +52,7 @@ public static function getPetsPlayerName(Player $player)
*/
public static function getPetsPlayer(Player $player)
{
if (isset(PetsSession::$players[$player->getName()])) {
return PetsSession::$players[$player->getName()];
}
return false;
return PetsSession::$players[$player->getName()] ?? false;
}


Expand All @@ -70,10 +67,11 @@ public static function setPets(Player $player, string $name)
PetsSession::$players[$player->getName()]["entity"] = Entity::$entityCount++;
PetsSession::$players[$player->getName()]["id"] = Pets::$pets[$name];

$pk = new AddEntityPacket();
$pk = new AddActorPacket();
$pk->entityRuntimeId = PetsSession::$players[$player->getName()]["entity"];
$pk->type = PetsSession::$players[$player->getName()]["id"];
$pk->type = AddActorPacket::LEGACY_ID_MAP_BC[PetsSession::$players[$player->getName()]["id"]];
$pk->position = $player->asVector3()->add(0, 3, 0);
$pk->motion = $this->getMotion();
$pk->yaw = $player->getYaw();
$pk->pitch = $player->getPitch();
if (in_array(PetsSession::$players[$player->getName()]["id"], self::BIGGEST_PETS_BY_ID)) {
Expand All @@ -93,7 +91,7 @@ public static function removePets(Player $player)

if (isset(PetsSession::$players[$player->getName()])) {

$pk = new RemoveEntityPacket();
$pk = new RemoveActorPacket();
$pk->entityUniqueId = PetsSession::$players[$player->getName()]["entity"];
$player->sendDataPacket($pk);

Expand Down