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

Replaced some bad usages of Vector3 get*() with their respective getFloor*()

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-02-14 18:45:10 +00:00
parent 0b82d5c8d4
commit a84aba5517
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/block/BlockFactory.php
View File

@ -390,9 +390,9 @@ class BlockFactory{
} }
if($pos !== null){ if($pos !== null){
$block->x = $pos->x; $block->x = $pos->getFloorX();
$block->y = $pos->y; $block->y = $pos->getFloorY();
$block->z = $pos->z; $block->z = $pos->getFloorZ();
$block->level = $pos->level; $block->level = $pos->level;
} }

2
src/pocketmine/inventory/ChestInventory.php
View File

@ -89,6 +89,6 @@ class ChestInventory extends ContainerInventory{
$pk->z = (int) $holder->z; $pk->z = (int) $holder->z;
$pk->eventType = 1; //it's always 1 for a chest $pk->eventType = 1; //it's always 1 for a chest
$pk->eventData = $isOpen ? 1 : 0; $pk->eventData = $isOpen ? 1 : 0;
$holder->getLevel()->addChunkPacket($holder->getX() >> 4, $holder->getZ() >> 4, $pk); $holder->getLevel()->addChunkPacket($holder->getFloorX() >> 4, $holder->getFloorZ() >> 4, $pk);
} }
} }

6
src/pocketmine/inventory/ContainerInventory.php
View File

@ -51,9 +51,9 @@ abstract class ContainerInventory extends BaseInventory{
if($holder instanceof Entity){ if($holder instanceof Entity){
$pk->entityUniqueId = $holder->getId(); $pk->entityUniqueId = $holder->getId();
}elseif($holder instanceof Vector3){ }elseif($holder instanceof Vector3){
$pk->x = (int) $holder->getX(); $pk->x = $holder->getFloorX();
$pk->y = (int) $holder->getY(); $pk->y = $holder->getFloorY();
$pk->z = (int) $holder->getZ(); $pk->z = $holder->getFloorZ();
} }
$who->dataPacket($pk); $who->dataPacket($pk);

2
src/pocketmine/inventory/EnderChestInventory.php
View File

@ -55,7 +55,7 @@ class EnderChestInventory extends ChestInventory{
* @param EnderChest $enderChest * @param EnderChest $enderChest
*/ */
public function setHolderPosition(EnderChest $enderChest){ public function setHolderPosition(EnderChest $enderChest){
$this->holder->setComponents($enderChest->getX(), $enderChest->getY(), $enderChest->getZ()); $this->holder->setComponents($enderChest->getFloorX(), $enderChest->getFloorY(), $enderChest->getFloorZ());
$this->holder->setLevel($enderChest->getLevel()); $this->holder->setLevel($enderChest->getLevel());
} }

4
src/pocketmine/level/Level.php
View File

@ -2666,7 +2666,7 @@ class Level implements ChunkManager, Metadatable{
throw new LevelException("Invalid Tile level"); throw new LevelException("Invalid Tile level");
} }
$this->tiles[$tile->getId()] = $tile; $this->tiles[$tile->getId()] = $tile;
$this->clearChunkCache($tile->getX() >> 4, $tile->getZ() >> 4); $this->clearChunkCache($tile->getFloorX() >> 4, $tile->getFloorZ() >> 4);
} }
/** /**
@ -2681,7 +2681,7 @@ class Level implements ChunkManager, Metadatable{
unset($this->tiles[$tile->getId()]); unset($this->tiles[$tile->getId()]);
unset($this->updateTiles[$tile->getId()]); unset($this->updateTiles[$tile->getId()]);
$this->clearChunkCache($tile->getX() >> 4, $tile->getZ() >> 4); $this->clearChunkCache($tile->getFloorX() >> 4, $tile->getFloorZ() >> 4);
} }
/** /**