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

Merge branch 'stable' into next-minor

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
Dylan K. Taylor
2020-05-31 14:43:53 +01:00
parent ecbf21acea 3f07f06874
commit 71e0521286
7 changed files with 1543 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/block/Water.php
View File

@ -70,8 +70,6 @@ class Water extends Liquid{
if($entity->isOnFire()){
$entity->extinguish();
}
$entity->resetFallDistance();
}
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{