mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-04-21 08:17:34 +00:00
Merge commit '4199c3796f4c6d8da0eccba64fe4cd9812acadeb'
# Conflicts: # resources/vanilla # src/pocketmine/block/Water.php
This commit is contained in:
commit
0a730db030
@ -51,7 +51,5 @@ class Water extends Liquid{
|
||||
if($entity->isOnFire()){
|
||||
$entity->extinguish();
|
||||
}
|
||||
|
||||
$entity->resetFallDistance();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user