Merge branch 'release/3.1' into release/3.2

This commit is contained in:
Dylan K. Taylor 2018-08-16 15:52:19 +01:00
commit 5424644ca1

View File

@ -197,7 +197,7 @@ class ItemEntity extends Entity{
}
public function onCollideWithPlayer(Player $player) : void{
if($this->getPickupDelay() > 0){
if($this->getPickupDelay() !== 0){
return;
}