mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
removed 2 useless handlers from Player(they were not sending any data to player), fixed bug 158
This commit is contained in:
parent
a66176b75d
commit
ad17a6880a
6 changed files with 10 additions and 17 deletions
|
|
@ -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){
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue