From baec22208fb323eb18ec3977f314e1c577377bd8 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes Pueyo <shoghicp@gmail.com>
Date: Sat, 12 Jan 2013 17:35:32 +0100
Subject: [PATCH] Updated event names

---
 src/API/BlockAPI.php                        | 23 +++------------------
 src/API/LevelAPI.php                        |  1 -
 src/classes/Player.class.php                | 12 +++++------
 src/classes/PocketMinecraftServer.class.php |  6 +++---
 4 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php
index 2b0466fce..d5fb2bd42 100644
--- a/src/API/BlockAPI.php
+++ b/src/API/BlockAPI.php
@@ -176,35 +176,18 @@ class BlockAPI{
 				$drop = array(3, 0, 1);
 				break;
 			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
-				$drop = array(330, 0, 1);
+				$drop = array(($target[0] === 64 ? 324:330), 0, 1);
 				if(($target[1] & 0x08) === 0x08){
 					$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["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] === 71){
+					if($up[0] === $target[0]){
 						$data2 = $data;
 						++$data2["y"];
 						$this->server->trigger("player.block.break", $data2);
diff --git a/src/API/LevelAPI.php b/src/API/LevelAPI.php
index f314a6b58..21f8ebd0f 100644
--- a/src/API/LevelAPI.php
+++ b/src/API/LevelAPI.php
@@ -49,7 +49,6 @@ class LevelAPI{
 			case "player.block.break":
 				$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);
-
 				if($block[0] === 0){
 					break;
 				}
diff --git a/src/classes/Player.class.php b/src/classes/Player.class.php
index 100f50fde..0cd46385b 100644
--- a/src/classes/Player.class.php
+++ b/src/classes/Player.class.php
@@ -112,7 +112,7 @@ class Player{
 
 	public function eventHandler($data, $event){
 		switch($event){
-			case "player.item.pick":
+			case "player.pickup":
 				if($data["eid"] === $this->eid){
 					$data["eid"] = 0;
 				}
@@ -124,7 +124,7 @@ class Player{
 				}
 				$this->dataPacket(MC_PLAYER_EQUIPMENT, $data);
 				break;
-			case "world.block.change":
+			case "block.change":
 				$this->dataPacket(MC_UPDATE_BLOCK, $data);
 				break;
 			case "entity.move":
@@ -148,7 +148,7 @@ class Player{
 					"eid" => $data->eid,
 				));
 				break;
-			case "server.time.change":
+			case "server.time":
 				$this->dataPacket(MC_SET_TIME, array(
 					"time" => $data,
 				));
@@ -323,14 +323,14 @@ class Player{
 									$this->entity->data["clientID"] = $this->clientID;
 									$this->server->api->entity->spawnAll($this);
 									$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("entity.remove", array($this, "eventHandler"));
 									$this->server->event("entity.move", array($this, "eventHandler"));
 									$this->server->event("entity.animate", array($this, "eventHandler"));
 									$this->server->event("player.equipment.change", array($this, "eventHandler"));
-									$this->server->event("player.item.pick", array($this, "eventHandler"));
-									$this->server->event("world.block.change", array($this, "eventHandler"));
+									$this->server->event("player.pickup", array($this, "eventHandler"));
+									$this->server->event("block.change", array($this, "eventHandler"));
 									console("[DEBUG] Player with EID ".$this->eid." \"".$this->username."\" spawned!", true, true, 2);
 
 									$this->eventHandler(new Container($this->server->motd), "server.chat");
diff --git a/src/classes/PocketMinecraftServer.class.php b/src/classes/PocketMinecraftServer.class.php
index 8cfd49d41..16e1c8712 100644
--- a/src/classes/PocketMinecraftServer.class.php
+++ b/src/classes/PocketMinecraftServer.class.php
@@ -93,8 +93,8 @@ class PocketMinecraftServer{
 	}
 
 	public function loadEvents(){
-		$this->event("player.new", array($this, "eventHandler"));
-		$this->action(500000, '$this->time += (int) ($this->timePerSecond / 2);$this->api->dhandle("server.time.change", $this->time);');
+		$this->event("player.add", array($this, "eventHandler"));
+		$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(1000000 * 60, '$this->reloadConfig();');
 		$this->action(1000000 * 60 * 10, '$this->custom = array();');
@@ -232,7 +232,7 @@ class PocketMinecraftServer{
 
 	public function eventHandler($data, $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);
 				break;
 		}