mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #2114 Removed Player collisions with other entities

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-22 11:26:12 +02:00
parent 3cc4afbcd6
commit 0a29e66b62
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Player.php
View File

@ -296,6 +296,10 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
} }
} }
public function canCollideWith(Entity $entity){
return false;
}
/** /**
* @return bool * @return bool
*/ */

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

@ -85,7 +85,7 @@ class Arrow extends Projectile{
$nearEntity = null; $nearEntity = null;
foreach($list as $entity){ foreach($list as $entity){
if(!$entity->canCollideWith($this) or ($entity === $this->shootingEntity and $this->ticksLived < 5)){ if(/*!$entity->canCollideWith($this) or */($entity === $this->shootingEntity and $this->ticksLived < 5)){
continue; continue;
} }

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

@ -1230,7 +1230,7 @@ class Level implements ChunkManager, Metadatable{
for($x = $minX; $x <= $maxX; ++$x){ for($x = $minX; $x <= $maxX; ++$x){
for($z = $minZ; $z <= $maxZ; ++$z){ for($z = $minZ; $z <= $maxZ; ++$z){
foreach($this->getChunkEntities($x, $z) as $ent){ foreach($this->getChunkEntities($x, $z) as $ent){
if($ent !== $entity and ($entity === null or ($ent->canCollideWith($entity) and $entity->canCollideWith($ent))) and $ent->boundingBox->intersectsWith($bb)){ if($ent !== $entity and ($entity === null or $entity->canCollideWith($ent)) and $ent->boundingBox->intersectsWith($bb)){
$nearby[] = $ent; $nearby[] = $ent;
} }
} }