diff --git a/src/API/TimeAPI.php b/src/API/TimeAPI.php index 80999776..b02da668 100644 --- a/src/API/TimeAPI.php +++ b/src/API/TimeAPI.php @@ -31,7 +31,7 @@ class TimeAPI{ $p = strtolower(array_shift($args)); switch($p){ case "check": - if(substr($args[0], 0, 2) === "w:"){ + if(substr(nullsafe($args[0], ""), 0, 2) === "w:"){ $levelName = preg_replace("/w:/", "", $args[0]); $level = $this->server->api->level->get($levelName); if($level instanceof Level){ @@ -44,7 +44,7 @@ class TimeAPI{ $output .= "Time" . $world . ": " . $this->getDate($level) . ", " . $this->getPhase($level) . " (" . $this->get(true, $level) . " ticks)\n"; break; case "add": - if(substr($args[1], 0, 2) === "w:"){ + if(substr(nullsafe($args[1], ""), 0, 2) === "w:"){ $levelName = preg_replace("/w:/", "", $args[1]); $level = $this->server->api->level->get($levelName); if($level instanceof Level){ diff --git a/src/Player.php b/src/Player.php index efc4ec51..ccb4c457 100755 --- a/src/Player.php +++ b/src/Player.php @@ -667,16 +667,6 @@ class Player{ */ public function eventHandler($data, $event){ switch($event){ - case "player.touch": - if($data["target"]->getID() === AIR){ - $this->useChunk(floor($data["target"]->x / 16), floor($data["target"]->z / 16)); - } - break; - case "player.block.break": - if($data["target"]->getID() === AIR){ - $this->useChunk(floor($data["target"]->x / 16), floor($data["target"]->z / 16)); - } - break; case "entity.link": $pk = new SetEntityLinkPacket(); if($data["rider"] === $this->eid){ @@ -1451,8 +1441,6 @@ class Player{ $this->evid[] = $this->server->event("player.pickup", [$this, "eventHandler"]); $this->evid[] = $this->server->event("tile.container.slot", [$this, "eventHandler"]); $this->evid[] = $this->server->event("tile.update", [$this, "eventHandler"]); - $this->evid[] = $this->server->event("player.touch", [$this, "eventHandler"]); - $this->evid[] = $this->server->event("player.block.break", [$this, "eventHandler"]); $this->lastMeasure = microtime(true); $this->server->schedule(50, [$this, "measureLag"], [], true); diff --git a/src/entity/animal/Sheep.php b/src/entity/animal/Sheep.php index f337c778..c6bbbf50 100644 --- a/src/entity/animal/Sheep.php +++ b/src/entity/animal/Sheep.php @@ -75,11 +75,14 @@ class Sheep extends Animal{ $slot = $e->player->getHeldItem(); if($slot->getID() === SHEARS){ if(!$this->isSheared()){ + if($e->player->gamemode != 1) $slot->useOn($this); $this->setSheared(1); $this->server->api->entity->drop($this, BlockAPI::getItem(WOOL, $this->getColor(), mt_rand(1, 3))); //$this->server->schedule(20, [$this, "eatGrass"]); if($slot->getMetadata() >= $slot->getMaxDurability()){ $e->player->removeItem($slot->getID(), $slot->getMetadata(), $slot->count, true); + }else{ + $e->player->setSlot($e->player->slot, $slot); } } return true; diff --git a/src/entity/monster/Creeper.php b/src/entity/monster/Creeper.php index 35e8de4c..f51e3015 100644 --- a/src/entity/monster/Creeper.php +++ b/src/entity/monster/Creeper.php @@ -35,8 +35,10 @@ class Creeper extends Monster{ if($e->isPlayer() && $action === InteractPacket::ACTION_HOLD){ $slot = $e->player->getHeldItem(); if($slot->getID() === FLINT_AND_STEEL && !$this->isIgnited()){ - if($slot->useOn($e) and $slot->getMetadata() >= $slot->getMaxDurability()){ + if($slot->useOn($this) && $slot->getMetadata() >= $slot->getMaxDurability()){ $e->player->removeItem($slot->getID(), $slot->getMetadata(), $slot->count, true); + }else{ + $e->player->setSlot($e->player->slot, $slot); } $this->ignite(); return true; diff --git a/src/material/item/tool/FlintSteelItem.php b/src/material/item/tool/FlintSteelItem.php index cff54f26..91fea310 100644 --- a/src/material/item/tool/FlintSteelItem.php +++ b/src/material/item/tool/FlintSteelItem.php @@ -25,7 +25,7 @@ class FlintSteelItem extends ItemTool{ $this->meta++; return true; }else{ - return parent::useOn($object, $force); + return $force ? parent::useOn($object, $force) : $force; } } } \ No newline at end of file diff --git a/src/world/Level.php b/src/world/Level.php index 487bd922..b2ab8d70 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -288,7 +288,7 @@ class Level{ return false; } $ret = $this->level->setBlock($pos->x, $pos->y, $pos->z, $block->getID(), $block->getMetadata()); - if($ret === true){ + if($ret === true){ if(!($pos instanceof Position)){ $pos = new Position($pos->x, $pos->y, $pos->z, $this); }