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

Allow negative potion effects

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-15 16:37:13 +02:00
parent c0782caab9
commit 1ef6328635
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,8 +294,8 @@ abstract class Entity extends Location implements Metadatable{
if(isset($this->effects[$effect->getId()])){ if(isset($this->effects[$effect->getId()])){
$oldEffect = $this->effects[$effect->getId()]; $oldEffect = $this->effects[$effect->getId()];
if( if(
$effect->getAmplifier() <= $oldEffect->getAmplifier() abs($effect->getAmplifier()) <= ($oldEffect->getAmplifier())
or ($effect->getAmplifier() === $oldEffect->getAmplifier() or (abs($effect->getAmplifier()) === abs($oldEffect->getAmplifier())
and $effect->getDuration() < $oldEffect->getDuration()) and $effect->getDuration() < $oldEffect->getDuration())
){ ){
return; return;
@ -602,7 +602,6 @@ abstract class Entity extends Location implements Metadatable{
*/ */
public function setMaxHealth($amount){ public function setMaxHealth($amount){
$this->maxHealth = (int) $amount; $this->maxHealth = (int) $amount;
$this->health = (int) min($this->health, $this->maxHealth);
} }
public function canCollideWith(Entity $entity){ public function canCollideWith(Entity $entity){