mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-19 15:35:52 +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
Show Stats 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);

12
src/pocketmine/entity/Projectile.php
View File

@ -37,6 +37,8 @@ abstract class Projectile extends Entity{
public $shootingEntity = null;
protected $damage = 0;
private $hadCollision = false;
protected function initEntity(){
$this->setMaxHealth(1);
$this->setHealth(1);
@ -90,7 +92,9 @@ abstract class Projectile extends Entity{
$movingObjectPosition = null;
$this->motionY -= $this->gravity;
if(!$this->isCollided){
$this->motionY -= $this->gravity;
}
$this->keepMovement = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
@ -159,12 +163,16 @@ abstract class Projectile extends Entity{
$this->move($this->motionX, $this->motionY, $this->motionZ);
if($this->onGround and ($this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0)){
if($this->isCollided and !$this->hadCollision){
$this->hadCollision = true;
$this->motionX = 0;
$this->motionY = 0;
$this->motionZ = 0;
$this->server->getPluginManager()->callEvent(new ProjectileHitEvent($this));
}elseif(!$this->isCollided and !$this->hadCollision){
$this->hadCollision = false;
}
if(!$this->onGround or $this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0){

2
src/pocketmine/entity/Snowball.php
View File

@ -52,7 +52,7 @@ class Snowball extends Projectile{
$hasUpdate = parent::onUpdate($currentTick);
if($this->age > 1200 or $this->onGround){
if($this->age > 1200 or $this->isCollided){
$this->kill();
$hasUpdate = true;
}