From 425ad6101f6761f6f43685ce35e702dbb19be46c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 20 Jan 2019 18:09:47 +0000 Subject: [PATCH] Block: rename onEntityCollide() -> onEntityInside() this better describes what the hook is for. --- src/pocketmine/block/Block.php | 5 ++++- src/pocketmine/block/Cactus.php | 2 +- src/pocketmine/block/Cobweb.php | 2 +- src/pocketmine/block/Fire.php | 2 +- src/pocketmine/block/Ladder.php | 2 +- src/pocketmine/block/Lava.php | 2 +- src/pocketmine/block/Magma.php | 2 +- src/pocketmine/block/TNT.php | 2 +- src/pocketmine/block/Vine.php | 2 +- src/pocketmine/block/Water.php | 2 +- src/pocketmine/entity/Entity.php | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index d02b7b623..faf41bda6 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -705,9 +705,12 @@ class Block extends Position implements BlockIds, Metadatable{ } /** + * Called when an entity's bounding box clips inside this block's cell. Note that the entity may not be intersecting + * with the collision box or bounding box. + * * @param Entity $entity */ - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ } diff --git a/src/pocketmine/block/Cactus.php b/src/pocketmine/block/Cactus.php index d7338b9f6..059129e01 100644 --- a/src/pocketmine/block/Cactus.php +++ b/src/pocketmine/block/Cactus.php @@ -74,7 +74,7 @@ class Cactus extends Transparent{ return AxisAlignedBB::one()->contract($shrinkSize, 0, $shrinkSize)->trim(Facing::UP, $shrinkSize); } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ $ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1); $entity->attack($ev); } diff --git a/src/pocketmine/block/Cobweb.php b/src/pocketmine/block/Cobweb.php index cdffe07da..4f424b348 100644 --- a/src/pocketmine/block/Cobweb.php +++ b/src/pocketmine/block/Cobweb.php @@ -55,7 +55,7 @@ class Cobweb extends Flowable{ return 1; } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ $entity->resetFallDistance(); } diff --git a/src/pocketmine/block/Fire.php b/src/pocketmine/block/Fire.php index 3b6681496..cae80261a 100644 --- a/src/pocketmine/block/Fire.php +++ b/src/pocketmine/block/Fire.php @@ -78,7 +78,7 @@ class Fire extends Flowable{ return true; } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ $ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1); $entity->attack($ev); diff --git a/src/pocketmine/block/Ladder.php b/src/pocketmine/block/Ladder.php index 0579b7e3c..ab6fb6268 100644 --- a/src/pocketmine/block/Ladder.php +++ b/src/pocketmine/block/Ladder.php @@ -74,7 +74,7 @@ class Ladder extends Transparent{ return true; } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ $entity->resetFallDistance(); $entity->onGround = true; } diff --git a/src/pocketmine/block/Lava.php b/src/pocketmine/block/Lava.php index 7e57418d1..2221d87cb 100644 --- a/src/pocketmine/block/Lava.php +++ b/src/pocketmine/block/Lava.php @@ -86,7 +86,7 @@ class Lava extends Liquid{ } } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ $entity->fallDistance *= 0.5; $ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4); diff --git a/src/pocketmine/block/Magma.php b/src/pocketmine/block/Magma.php index 4a83750a6..d246a4969 100644 --- a/src/pocketmine/block/Magma.php +++ b/src/pocketmine/block/Magma.php @@ -60,7 +60,7 @@ class Magma extends Solid{ return true; } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ if(!$entity->isSneaking()){ $ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1); $entity->attack($ev); diff --git a/src/pocketmine/block/TNT.php b/src/pocketmine/block/TNT.php index 773592452..76421375b 100644 --- a/src/pocketmine/block/TNT.php +++ b/src/pocketmine/block/TNT.php @@ -66,7 +66,7 @@ class TNT extends Solid{ return true; } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ if($entity instanceof Arrow and $entity->isOnFire()){ $this->ignite(); } diff --git a/src/pocketmine/block/Vine.php b/src/pocketmine/block/Vine.php index d40a76824..724726446 100644 --- a/src/pocketmine/block/Vine.php +++ b/src/pocketmine/block/Vine.php @@ -93,7 +93,7 @@ class Vine extends Flowable{ return true; } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ $entity->resetFallDistance(); } diff --git a/src/pocketmine/block/Water.php b/src/pocketmine/block/Water.php index 948386c37..961adb482 100644 --- a/src/pocketmine/block/Water.php +++ b/src/pocketmine/block/Water.php @@ -48,7 +48,7 @@ class Water extends Liquid{ return 5; } - public function onEntityCollide(Entity $entity) : void{ + public function onEntityInside(Entity $entity) : void{ $entity->resetFallDistance(); if($entity->isOnFire()){ $entity->extinguish(); diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 2b0977652..340af4f30 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -1548,7 +1548,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{ $vector = $this->temporalVector->setComponents(0, 0, 0); foreach($this->getBlocksAround() as $block){ - $block->onEntityCollide($this); + $block->onEntityInside($this); $block->addVelocityToEntity($this, $vector); }