From abccfeac3752dbfe521017ef611df49abecf1d87 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Thu, 10 Apr 2014 05:04:58 +0200
Subject: [PATCH] Updated Vector-related classes

---
 src/pocketmine/block/Block.php                |  5 +-
 src/pocketmine/level/Position.php             |  7 +-
 src/pocketmine/level/format/ChunkSection.php  |  0
 .../level/format/anvil/RegionLoader.php       |  0
 .../level/format/generic/BaseChunk.php        |  0
 .../format/generic/EmptyChunkSection.php      | 67 +++++++++++++++++++
 .../level/format/pmf/ChunkSection.php         | 22 ++++++
 .../{ => level/format}/pmf/LevelFormat.php    |  0
 src/pocketmine/{ => level/format}/pmf/PMF.php |  0
 9 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 src/pocketmine/level/format/ChunkSection.php
 create mode 100644 src/pocketmine/level/format/anvil/RegionLoader.php
 create mode 100644 src/pocketmine/level/format/generic/BaseChunk.php
 create mode 100644 src/pocketmine/level/format/generic/EmptyChunkSection.php
 create mode 100644 src/pocketmine/level/format/pmf/ChunkSection.php
 rename src/pocketmine/{ => level/format}/pmf/LevelFormat.php (100%)
 rename src/pocketmine/{ => level/format}/pmf/PMF.php (100%)

diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php
index 7588f5612..fa0b411e4 100644
--- a/src/pocketmine/block/Block.php
+++ b/src/pocketmine/block/Block.php
@@ -665,11 +665,12 @@ abstract class Block extends Position{
 	 * Returns the Block on the side $side, works like Vector3::side()
 	 *
 	 * @param int $side
+	 * @param int $step
 	 *
 	 * @return Block
 	 */
-	public function getSide($side){
-		$v = parent::getSide($side);
+	public function getSide($side, $step = 1){
+		$v = parent::getSide($side, $step);
 		if($this->level instanceof Level){
 			return $this->level->getBlock($v);
 		}
diff --git a/src/pocketmine/level/Position.php b/src/pocketmine/level/Position.php
index bfdeee699..3590c5a02 100644
--- a/src/pocketmine/level/Position.php
+++ b/src/pocketmine/level/Position.php
@@ -48,12 +48,13 @@ class Position extends Vector3{
 	/**
 	 * Returns a side Vector
 	 *
-	 * @param $side
+	 * @param int $side
+	 * @param int $step
 	 *
 	 * @return Position
 	 */
-	public function getSide($side){
-		return Position::fromObject(parent::getSide($side), $this->level);
+	public function getSide($side, $step = 1){
+		return Position::fromObject(parent::getSide($side, $step), $this->level);
 	}
 
 	/**
diff --git a/src/pocketmine/level/format/ChunkSection.php b/src/pocketmine/level/format/ChunkSection.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/pocketmine/level/format/anvil/RegionLoader.php b/src/pocketmine/level/format/anvil/RegionLoader.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/pocketmine/level/format/generic/BaseChunk.php b/src/pocketmine/level/format/generic/BaseChunk.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/pocketmine/level/format/generic/EmptyChunkSection.php b/src/pocketmine/level/format/generic/EmptyChunkSection.php
new file mode 100644
index 000000000..6a3f43fe7
--- /dev/null
+++ b/src/pocketmine/level/format/generic/EmptyChunkSection.php
@@ -0,0 +1,67 @@
+<?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\level\format;
+
+/**
+ * Stub used to detect empty chunks
+ */
+class EmptyChunkSection implements ChunkSection{
+	final public function getBlockId($x, $y, $z){
+		return 0;
+	}
+
+	final public function getBlockIdColumn($x, $z){
+		return "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+	}
+
+	final public function getBlockDataColumn($x, $z){
+		return "\x00\x00\x00\x00\x00\x00\x00\x00";
+	}
+
+	final public function setBlockId($x, $y, $z, $id){
+
+	}
+
+	final public function getBlockData($x, $y, $z){
+		return 0;
+	}
+
+	final public function setBlockData($x, $y, $z, $data){
+
+	}
+
+	final public function getBlockLight($x, $y, $z){
+		return 0;
+	}
+
+	final public function setBlockLight($x, $y, $z, $level){
+
+	}
+
+	final public function getBlockSkyLight($x, $y, $z){
+		return 0;
+	}
+
+	final public function setBlockSkyLight($x, $y, $z, $level){
+
+	}
+}
\ No newline at end of file
diff --git a/src/pocketmine/level/format/pmf/ChunkSection.php b/src/pocketmine/level/format/pmf/ChunkSection.php
new file mode 100644
index 000000000..5f38bb51a
--- /dev/null
+++ b/src/pocketmine/level/format/pmf/ChunkSection.php
@@ -0,0 +1,22 @@
+<?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
\ No newline at end of file
diff --git a/src/pocketmine/pmf/LevelFormat.php b/src/pocketmine/level/format/pmf/LevelFormat.php
similarity index 100%
rename from src/pocketmine/pmf/LevelFormat.php
rename to src/pocketmine/level/format/pmf/LevelFormat.php
diff --git a/src/pocketmine/pmf/PMF.php b/src/pocketmine/level/format/pmf/PMF.php
similarity index 100%
rename from src/pocketmine/pmf/PMF.php
rename to src/pocketmine/level/format/pmf/PMF.php