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

Added vertical and horizontal collision detection to Entities

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-11-04 12:23:42 +01:00
parent 32dae93ef9
commit cc7f12739d
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,10 @@ abstract class Entity extends Location implements Metadatable{
public $canCollide = true;
protected $isStatic = false;
protected $isColliding = false;
public $isCollided = false;
public $isCollidedHorizontally = false;
public $isCollidedVertically = false;
public $noDamageTicks;
private $justCreated;
@ -811,11 +814,6 @@ abstract class Entity extends Location implements Metadatable{
return false;
}
public function collision(){
$this->isColliding = true;
$this->fallDistance = 0;
}
public function move($dx, $dy, $dz){
if($dx == 0 and $dz == 0 and $dy == 0){
@ -1009,7 +1007,11 @@ abstract class Entity extends Location implements Metadatable{
$this->onGround = false;
}
}
$this->isCollided = $this->onGround;
}else{
$this->isCollidedVertically = $movY != $dy;
$this->isCollidedHorizontally = ($movX != $dx or $movZ != $dz);
$this->isCollided = ($this->isCollidedHorizontally or $this->isCollidedVertically);
$this->onGround = ($movY != $dy and $movY < 0);
}
$this->updateFallState($dy, $this->onGround);