diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php
index 6d09e665e..19de2e02c 100644
--- a/src/API/BlockAPI.php
+++ b/src/API/BlockAPI.php
@@ -202,7 +202,7 @@ class BlockAPI{
 			"z" => $pos->z + mt_rand(2, 8) / 10,
 			"item" => $item,
 		);
-		if($this->server->api->handle("block.drop", $data) !== false){
+		if($this->server->api->handle("item.drop", $data) !== false){
 			for($count = $item->count; $count > 0; ){
 				$item->count = min($item->getMaxStackSize(), $count);
 				$count -= $item->count;
diff --git a/src/API/LevelAPI.php b/src/API/LevelAPI.php
index 9be55f236..6c8f25b81 100644
--- a/src/API/LevelAPI.php
+++ b/src/API/LevelAPI.php
@@ -34,27 +34,11 @@ class LevelAPI{
 	}
 
 	public function init(){
-		/*$this->server->event("player.block.break", array($this, "handle"));
-		$this->server->event("player.block.place", array($this, "handle"));
-		$this->server->event("player.block.update", array($this, "handle"));*/
+
 	}
 
 	public function handle($data, $event){
 		switch($event){
-			case "player.block.place":
-			case "player.block.update":
-				$b = BlockAPI::get($data["block"], $data["meta"]);
-				console("[DEBUG] Player ".$data["entity"]->player->username." placed ".$b->getName()." (".$data["block"].":".$data["meta"].") at (".$data["x"].", ".$data["y"].", ".$data["z"].")", true, true, 2);
-				$this->setBlock($data["x"], $data["y"], $data["z"], $data["block"], $data["meta"]);
-				break;
-			case "player.block.break":
-				if($data["block"]->getID() === 0){
-					break;
-				}
-				$b = BlockAPI::get($block[0], $block[1]);
-				console("[DEBUG] Player ".$data["player"]->username." broke ".$data["block"]->getName()." (".$data["block"]->getID().":".$data["block"]->getMetadata().") at (".$data["block"]->x.", ".$data["block"]->y.", ".$data["block"]->z.")", true, true, 2);
-				$this->setBlock($data["block"]->x, $data["block"]->y, $data["block"]->z, 0, 0, true, true);
-				break;
 		}
 	}
 
diff --git a/src/Player.php b/src/Player.php
index d63d8236e..878193f4a 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -188,7 +188,7 @@ class Player{
 			foreach($this->evid as $ev){
 				$this->server->deleteEvent($ev);
 			}
-			$this->server->api->dhandle("player.quit", $this);
+			$this->server->api->handle("player.quit", $this);
 			$reason = $reason == "" ? "server stop":$reason;
 			$this->save();
 			$this->eventHandler(new Container("You have been kicked. Reason: ".$reason), "server.chat");
@@ -548,7 +548,7 @@ class Player{
 								$u->close("logged in from another location");
 							}
 							
-							if($this->server->api->dhandle("player.join", $this) === false){
+							if($this->server->api->handle("player.join", $this) === false){
 								$this->close();
 								return;
 							}
@@ -661,8 +661,10 @@ class Player{
 								break;
 							}
 							$data["eid"] = $this->eid;
+							$data["player"] = $this;
+							$data["item"] = BlockAPI::getItem($data["block"], $data["meta"]);
 							if($this->server->handle("player.equipment.change", $data) !== false){
-								$this->equipment = BlockAPI::getItem($data["block"], $data["meta"]);
+								$this->equipment = $data["item"];
 								console("[DEBUG] Player ".$this->username." has now ".$this->equipment->getName()." (".$this->equipment->getID().":".$this->equipment->getMetadata().") in their hands!", true, true, 2);
 							}
 							break;