mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-20 15:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Updated to receive new optimizations

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-10-30 16:02:48 +01:00
parent 6e8e2a79dd
commit 57d1847c50
7 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/entity/Entity.php
View File

@@ -776,7 +776,8 @@ abstract class Entity extends Location implements Metadatable{
}
public function isInsideOfWater(){
$block = $this->level->getBlock(Vector3::createVector($this->x, $y = ($this->y + $this->getEyeHeight()), $this->z)->floor());
$pos = Vector3::createVector($this->x, $y = ($this->y + $this->getEyeHeight()), $this->z);
$block = $this->level->getBlock($pos->floor());
if($block instanceof Water){
$f = ($block->y + 1) - ($block->getFluidHeightPercent() - 0.1111111);
@@ -787,7 +788,8 @@ abstract class Entity extends Location implements Metadatable{
}
public function isInsideOfSolid(){
$block = $this->level->getBlock(Vector3::createVector($this->x, $y = ($this->y + $this->getEyeHeight()), $this->z)->floor());
$pos = Vector3::createVector($this->x, $y = ($this->y + $this->getEyeHeight()), $this->z);
$block = $this->level->getBlock($pos->floor());
$bb = $block->getBoundingBox();

6
src/pocketmine/entity/FallingSand.php
View File

@@ -90,7 +90,8 @@ class FallingSand extends Entity{
if(!$this->dead){
if($this->ticksLived === 1){
$block = $this->level->getBlock($pos = Vector3::cloneVector($this)->floor());
$pos = Vector3::cloneVector($this);
$block = $this->level->getBlock($pos->floor());
if($block->getID() != $this->blockId){
$this->kill();
return true;
@@ -109,7 +110,8 @@ class FallingSand extends Entity{
$this->motionY *= 1 - $this->drag;
$this->motionZ *= $friction;
$pos = Vector3::cloneVector($this)->floor();
$pos = Vector3::cloneVector($this);
$pos = $pos->floor();
if($this->onGround){
$this->kill();