diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index 8443fdb0..a9d3589a 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -126,7 +126,7 @@ class ServerAPI{ "gamemode" => SURVIVAL, "hardcore" => false, "pvp" => true, - "difficulty" => 1, + "difficulty" => 2, "generator-settings" => "", "level-name" => "world", "level-seed" => "", diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 3b069dce..53e690d7 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -48,7 +48,7 @@ class PocketMinecraftServer{ $this->handlers = []; $this->invisible = false; $this->levelData = false; - $this->difficulty = 1; + $this->difficulty = 2; $this->tiles = []; $this->entities = []; $this->custom = []; diff --git a/src/entity/Entity.php b/src/entity/Entity.php index fce38d94..67c90a8e 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -1315,6 +1315,21 @@ class Entity extends Position if (! $this->canBeAttacked) { return false; } + + if(is_numeric($cause) && ($entity = $this->server->api->entity->get($cause)) != false){ + switch($this->server->difficulty){ + //case 0: looks like mobs also have 0 attack dmg in peaceful mode + // $dmg = 0; + // break; + case 1: + $dmg = (int)($dmg / 3) + 1; + break; + case 3: + $dmg = 3 * (int)($dmg / 2); + break; + } + } + $dmg = $this->applyArmor($dmg, $cause); $ret = $this->setHealth(max(- 128, $this->getHealth() - ((int) $dmg)), $cause, $force); diff --git a/src/entity/monster/Skeleton.php b/src/entity/monster/Skeleton.php index 5d90b4d3..712ca59d 100644 --- a/src/entity/monster/Skeleton.php +++ b/src/entity/monster/Skeleton.php @@ -16,7 +16,7 @@ class Skeleton extends Monster{ } public function getAttackDamage(){ - return 0; //TODO special attack + return 0; } public function updateBurning(){ diff --git a/src/entity/monster/Spider.php b/src/entity/monster/Spider.php index 7ebeddf4..ee0a6637 100644 --- a/src/entity/monster/Spider.php +++ b/src/entity/monster/Spider.php @@ -14,6 +14,9 @@ class Spider extends Monster{ $this->ai->addTask(new TaskAttackPlayer(1.0, 16)); //TODO fix range? } + public function getAttackDamage(){ + return 2; + } public function attackEntity($entity, $distance){ if($distance > 2.0 && $distance < 6.0){