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.0

Browse Source
This commit is contained in:
Dylan K. Taylor
2016-12-16 10:29:58 +00:00
parent 146f5a567f 5ce6c6227f
commit 2930cf80b4
27 changed files with 130 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/entity/Entity.php
View File

@ -104,8 +104,8 @@ abstract class Entity extends Location implements Metadatable{
* 53 (unknown) */
const DATA_BOUNDING_BOX_WIDTH = 54; //float
const DATA_BOUNDING_BOX_HEIGHT = 55; //float
/* 56 (unknown)
* 57 (vector3f)
const DATA_FUSE_LENGTH = 56; //int
/* 57 (vector3f)
* 58 (byte)
* 59 (float)
* 60 (float) */
@ -1610,6 +1610,7 @@ abstract class Entity extends Location implements Metadatable{
* @param int $id
* @param int $type
* @param mixed $value
* @param bool $send
*
* @return bool
*/

3
src/pocketmine/entity/Human.php
View File

@ -236,7 +236,8 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
}
public function recalculateXpProgress() : float{
$this->setXpProgress($this->getRemainderXp() / self::getTotalXpForLevel($this->getXpLevel()));
$this->setXpProgress($progress = $this->getRemainderXp() / self::getTotalXpForLevel($this->getXpLevel()));
return $progress;
}
public static function getTotalXpForLevel(int $level) : int{

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

@ -2,11 +2,11 @@
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@ -15,7 +15,7 @@
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*
*/
@ -57,6 +57,9 @@ class PrimedTNT extends Entity implements Explosive{
}else{
$this->fuse = 80;
}
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_IGNITED, true);
$this->setDataProperty(self::DATA_FUSE_LENGTH, self::DATA_TYPE_INT, $this->fuse);
}
@ -81,6 +84,11 @@ class PrimedTNT extends Entity implements Explosive{
if($tickDiff <= 0 and !$this->justCreated){
return true;
}
if($this->fuse % 5 === 0){ //don't spam it every tick, it's not necessary
$this->setDataProperty(self::DATA_FUSE_LENGTH, self::DATA_TYPE_INT, $this->fuse);
}
$this->lastUpdate = $currentTick;
$hasUpdate = $this->entityBaseTick($tickDiff);