mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 10:53:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-17 17:14:16 +01:00
parent 643e10037c 83f29e5639
commit 4f1302adf2
215 changed files with 1482 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/entity/PrimedTNT.php
View File

@ -63,14 +63,14 @@ class PrimedTNT extends Entity implements Explosive{
$this->fuse = 80;
}
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_IGNITED, true);
$this->setGenericFlag(self::DATA_FLAG_IGNITED, true);
$this->setDataProperty(self::DATA_FUSE_LENGTH, self::DATA_TYPE_INT, $this->fuse);
$this->level->broadcastLevelEvent($this, LevelEventPacket::EVENT_SOUND_IGNITE);
}
public function canCollideWith(Entity $entity){
public function canCollideWith(Entity $entity) : bool{
return false;
}
@ -79,7 +79,7 @@ class PrimedTNT extends Entity implements Explosive{
$this->namedtag->Fuse = new ByteTag("Fuse", $this->fuse);
}
public function onUpdate($currentTick){
public function onUpdate(int $currentTick) : bool{
if($this->closed){
return false;