mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Updated event names

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-01-12 17:35:32 +01:00
parent 62a7461bbd
commit baec22208f
4 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/API/BlockAPI.php
View File

@ -176,35 +176,18 @@ class BlockAPI{
$drop = array(3, 0, 1); $drop = array(3, 0, 1);
break; break;
case 64: //Wood Door case 64: //Wood Door
$drop = array(324, 0, 1);
if(($target[1] & 0x08) === 0x08){
$down = $this->server->api->level->getBlock($data["x"], $data["y"] - 1, $data["z"]);
if($down[0] === 64){
$data2 = $data;
--$data2["y"];
$this->server->trigger("player.block.break", $data2);
}
}else{
$up = $this->server->api->level->getBlock($data["x"], $data["y"] + 1, $data["z"]);
if($up[0] === 64){
$data2 = $data;
++$data2["y"];
$this->server->trigger("player.block.break", $data2);
}
}
break;
case 71: //Iron Door case 71: //Iron Door
$drop = array(330, 0, 1); $drop = array(($target[0] === 64 ? 324:330), 0, 1);
if(($target[1] & 0x08) === 0x08){ if(($target[1] & 0x08) === 0x08){
$down = $this->server->api->level->getBlock($data["x"], $data["y"] - 1, $data["z"]); $down = $this->server->api->level->getBlock($data["x"], $data["y"] - 1, $data["z"]);
if($down[0] === 71){ if($down[0] === $target[0]){
$data2 = $data; $data2 = $data;
--$data2["y"]; --$data2["y"];
$this->server->trigger("player.block.break", $data2); $this->server->trigger("player.block.break", $data2);
} }
}else{ }else{
$up = $this->server->api->level->getBlock($data["x"], $data["y"] + 1, $data["z"]); $up = $this->server->api->level->getBlock($data["x"], $data["y"] + 1, $data["z"]);
if($up[0] === 71){ if($up[0] === $target[0]){
$data2 = $data; $data2 = $data;
++$data2["y"]; ++$data2["y"];
$this->server->trigger("player.block.break", $data2); $this->server->trigger("player.block.break", $data2);

1
src/API/LevelAPI.php
View File

@ -49,7 +49,6 @@ class LevelAPI{
case "player.block.break": case "player.block.break":
$block = $this->getBlock($data["x"], $data["y"], $data["z"]); $block = $this->getBlock($data["x"], $data["y"], $data["z"]);
console("[DEBUG] EID ".$data["eid"]." broke ".$block[0].":".$block[1]." at X ".$data["x"]." Y ".$data["y"]." Z ".$data["z"], true, true, 2); console("[DEBUG] EID ".$data["eid"]." broke ".$block[0].":".$block[1]." at X ".$data["x"]." Y ".$data["y"]." Z ".$data["z"], true, true, 2);
if($block[0] === 0){ if($block[0] === 0){
break; break;
} }

12
src/classes/Player.class.php
View File

@ -112,7 +112,7 @@ class Player{
public function eventHandler($data, $event){ public function eventHandler($data, $event){
switch($event){ switch($event){
case "player.item.pick": case "player.pickup":
if($data["eid"] === $this->eid){ if($data["eid"] === $this->eid){
$data["eid"] = 0; $data["eid"] = 0;
} }
@ -124,7 +124,7 @@ class Player{
} }
$this->dataPacket(MC_PLAYER_EQUIPMENT, $data); $this->dataPacket(MC_PLAYER_EQUIPMENT, $data);
break; break;
case "world.block.change": case "block.change":
$this->dataPacket(MC_UPDATE_BLOCK, $data); $this->dataPacket(MC_UPDATE_BLOCK, $data);
break; break;
case "entity.move": case "entity.move":
@ -148,7 +148,7 @@ class Player{
"eid" => $data->eid, "eid" => $data->eid,
)); ));
break; break;
case "server.time.change": case "server.time":
$this->dataPacket(MC_SET_TIME, array( $this->dataPacket(MC_SET_TIME, array(
"time" => $data, "time" => $data,
)); ));
@ -323,14 +323,14 @@ class Player{
$this->entity->data["clientID"] = $this->clientID; $this->entity->data["clientID"] = $this->clientID;
$this->server->api->entity->spawnAll($this); $this->server->api->entity->spawnAll($this);
$this->server->api->entity->spawnToAll($this->eid); $this->server->api->entity->spawnToAll($this->eid);
$this->server->event("server.time.change", array($this, "eventHandler")); $this->server->event("server.timee", array($this, "eventHandler"));
$this->server->event("server.chat", array($this, "eventHandler")); $this->server->event("server.chat", array($this, "eventHandler"));
$this->server->event("entity.remove", array($this, "eventHandler")); $this->server->event("entity.remove", array($this, "eventHandler"));
$this->server->event("entity.move", array($this, "eventHandler")); $this->server->event("entity.move", array($this, "eventHandler"));
$this->server->event("entity.animate", array($this, "eventHandler")); $this->server->event("entity.animate", array($this, "eventHandler"));
$this->server->event("player.equipment.change", array($this, "eventHandler")); $this->server->event("player.equipment.change", array($this, "eventHandler"));
$this->server->event("player.item.pick", array($this, "eventHandler")); $this->server->event("player.pickup", array($this, "eventHandler"));
$this->server->event("world.block.change", array($this, "eventHandler")); $this->server->event("block.change", array($this, "eventHandler"));
console("[DEBUG] Player with EID ".$this->eid." \"".$this->username."\" spawned!", true, true, 2); console("[DEBUG] Player with EID ".$this->eid." \"".$this->username."\" spawned!", true, true, 2);
$this->eventHandler(new Container($this->server->motd), "server.chat"); $this->eventHandler(new Container($this->server->motd), "server.chat");

6
src/classes/PocketMinecraftServer.class.php
View File

@ -93,8 +93,8 @@ class PocketMinecraftServer{
} }
public function loadEvents(){ public function loadEvents(){
$this->event("player.new", array($this, "eventHandler")); $this->event("player.add", array($this, "eventHandler"));
$this->action(500000, '$this->time += (int) ($this->timePerSecond / 2);$this->api->dhandle("server.time.change", $this->time);'); $this->action(500000, '$this->time += (int) ($this->timePerSecond / 2);$this->api->dhandle("server.time", $this->time);');
$this->action(5000000, 'if($this->difficulty < 2){$this->api->dhandle("server.regeneration", 1);}'); $this->action(5000000, 'if($this->difficulty < 2){$this->api->dhandle("server.regeneration", 1);}');
$this->action(1000000 * 60, '$this->reloadConfig();'); $this->action(1000000 * 60, '$this->reloadConfig();');
$this->action(1000000 * 60 * 10, '$this->custom = array();'); $this->action(1000000 * 60 * 10, '$this->custom = array();');
@ -232,7 +232,7 @@ class PocketMinecraftServer{
public function eventHandler($data, $event){ public function eventHandler($data, $event){
switch($event){ switch($event){
case "player.new": case "player.add":
console("[DEBUG] Player \"".$data["username"]."\" EID ".$data["eid"]." spawned at X ".$data["x"]." Y ".$data["y"]." Z ".$data["z"], true, true, 2); console("[DEBUG] Player \"".$data["username"]."\" EID ".$data["eid"]." spawned at X ".$data["x"]." Y ".$data["y"]." Z ".$data["z"], true, true, 2);
break; break;
} }