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

Revert "Fix #1615"

Browse Source 
This reverts commit a8359f29a81a9cc6836b14535a3256f06853482b.
This commit is contained in:
williamtdr 2014-07-11 09:12:19 -05:00
parent a8359f29a8
commit 3e882ef40d
1 changed files with 60 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,9 +59,6 @@ abstract class Living extends Entity implements Damageable{
public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){ public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
//TODO: attack tick limit //TODO: attack tick limit
if($this instanceof Player && $this->getGamemode() === 1 && $source != EntityDamageEvent::CAUSE_MAGIC) {
return;
}
$pk = new EntityEventPacket(); $pk = new EntityEventPacket();
$pk->eid = $this->getID(); $pk->eid = $this->getID();
$pk->event = 2; //Ouch! $pk->event = 2; //Ouch!