From bda6f03e154074c540e4ca93d63f584516c108fa Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 15 Oct 2014 13:07:10 +0200
Subject: [PATCH] Added BlockUpdateEvent

---
 src/pocketmine/event/block/BlockEvent.php     |  2 +-
 .../event/block/BlockUpdateEvent.php          | 34 +++++++++++++++++++
 src/pocketmine/level/Level.php                | 33 ++++++++++--------
 3 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 src/pocketmine/event/block/BlockUpdateEvent.php

diff --git a/src/pocketmine/event/block/BlockEvent.php b/src/pocketmine/event/block/BlockEvent.php
index c2ac0eb47..dbc4b69a4 100644
--- a/src/pocketmine/event/block/BlockEvent.php
+++ b/src/pocketmine/event/block/BlockEvent.php
@@ -34,7 +34,7 @@ abstract class BlockEvent extends Event{
 	/**
 	 * @param Block $block
 	 */
-	protected function __construct(Block $block){
+	public function __construct(Block $block){
 		$this->block = $block;
 	}
 
diff --git a/src/pocketmine/event/block/BlockUpdateEvent.php b/src/pocketmine/event/block/BlockUpdateEvent.php
new file mode 100644
index 000000000..5d01b0260
--- /dev/null
+++ b/src/pocketmine/event/block/BlockUpdateEvent.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link   http://www.pocketmine.net/
+ *
+ *
+ */
+
+namespace pocketmine\event\block;
+
+use pocketmine\block\Block;
+use pocketmine\event\Cancellable;
+use pocketmine\Player;
+
+/**
+ * Called when a block tries to be updated due to a neighbor change
+ */
+class BlockUpdateEvent extends BlockEvent implements Cancellable{
+	public static $handlerList = null;
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 2877cf9ca..ac40c4e21 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -49,6 +49,7 @@ use pocketmine\entity\DroppedItem;
 use pocketmine\entity\Entity;
 use pocketmine\event\block\BlockBreakEvent;
 use pocketmine\event\block\BlockPlaceEvent;
+use pocketmine\event\block\BlockUpdateEvent;
 use pocketmine\event\level\ChunkLoadEvent;
 use pocketmine\event\level\ChunkPopulateEvent;
 use pocketmine\event\level\ChunkUnloadEvent;
@@ -689,21 +690,20 @@ class Level implements ChunkManager, Metadatable{
 
 	/**
 	 * @param Vector3 $pos
-	 * @param int     $type
 	 */
-	public function updateAround(Vector3 $pos, $type = self::BLOCK_UPDATE_NORMAL){
+	public function updateAround(Vector3 $pos){
 		if($pos instanceof Block){
 			$block = $pos;
 		}else{
 			$block = $this->getBlock($pos);
 		}
 
-		$block->getSide(0)->onUpdate($type);
-		$block->getSide(1)->onUpdate($type);
-		$block->getSide(2)->onUpdate($type);
-		$block->getSide(3)->onUpdate($type);
-		$block->getSide(4)->onUpdate($type);
-		$block->getSide(5)->onUpdate($type);
+		for($side = 0; $side <= 5; ++$side){
+			$this->server->getPluginManager()->callEvent($ev = new BlockUpdateEvent($block->getSide($side)));
+			if(!$ev->isCancelled()){
+				$ev->getBlock()->onUpdate(self::BLOCK_UPDATE_NORMAL);
+			}
+		}
 	}
 
 	/**
@@ -937,7 +937,7 @@ class Level implements ChunkManager, Metadatable{
 				Cache::remove("world:" . $this->getID() . ":" . $index);
 			}
 
-			if($direct === true){
+			//if($direct === true){
 				$pk = new UpdateBlockPacket;
 				$pk->x = $pos->x;
 				$pk->y = $pos->y;
@@ -949,7 +949,7 @@ class Level implements ChunkManager, Metadatable{
 					/** @var Player $player */
 					$player->dataPacket($pk);
 				}
-			}else{
+			/*}else{
 				if(!($pos instanceof Position)){
 					$pos = new Position($pos->x, $pos->y, $pos->z, $this);
 				}
@@ -964,13 +964,16 @@ class Level implements ChunkManager, Metadatable{
 					$this->changedCount[$index] |= 1 << $Y;
 				}
 				$this->changedBlocks[$index][$Y][] = clone $block;
-			}
+			}*/
 
 			if($update === true){
-				$this->updateAround($pos, self::BLOCK_UPDATE_NORMAL);
-				$block->onUpdate(self::BLOCK_UPDATE_NORMAL);
-				foreach($this->getNearbyEntities(new AxisAlignedBB($block->x - 1, $block->y - 1, $block->z - 1, $block->x + 2, $block->y + 2, $block->z + 2)) as $entity){
-					$entity->scheduleUpdate();
+				$this->updateAround($pos);
+				$this->server->getPluginManager()->callEvent($ev = new BlockUpdateEvent($block));
+				if(!$ev->isCancelled()){
+					$ev->getBlock()->onUpdate(self::BLOCK_UPDATE_NORMAL);
+					foreach($this->getNearbyEntities(new AxisAlignedBB($block->x - 1, $block->y - 1, $block->z - 1, $block->x + 2, $block->y + 2, $block->z + 2)) as $entity){
+						$entity->scheduleUpdate();
+					}
 				}
 			}
 		}