mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-22 03:14:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1615

Browse Source 
Players in creative cannot die from non-magic (plugin/console) causes.
This commit is contained in:
williamtdr 2014-07-11 09:14:49 -05:00
parent 3e882ef40d
commit 61043d2e0d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,9 @@ abstract class Living extends Entity implements Damageable{
public abstract function getName(); public abstract function getName();
public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){ public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
if($this instanceof Player and ($this->getGamemode() & 0x01) === 1 and $source != EntityDamageEvent::CAUSE_MAGIC) {
return;
}
//TODO: attack tick limit //TODO: attack tick limit
$pk = new EntityEventPacket(); $pk = new EntityEventPacket();
$pk->eid = $this->getID(); $pk->eid = $this->getID();
@ -103,4 +106,4 @@ abstract class Living extends Entity implements Damageable{
public function getDrops(){ public function getDrops(){
return []; return [];
} }
} }