From f46473bbe8032b45f2350678ef573b6aa14a8096 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Fri, 2 Jan 2015 18:52:45 +0100
Subject: [PATCH] Removed all @mkdir() calls

---
 src/pocketmine/PocketMine.php                      |  4 +++-
 src/pocketmine/Server.php                          | 14 +++++++++++---
 src/pocketmine/command/defaults/TimingsCommand.php |  5 ++++-
 .../level/format/generic/BaseLevelProvider.php     |  4 +++-
 src/pocketmine/level/format/leveldb/LevelDB.php    | 12 +++++++++---
 src/pocketmine/level/format/mcregion/McRegion.php  |  9 +++++++--
 src/pocketmine/plugin/PluginBase.php               |  4 +++-
 7 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index 469e9b3be..39b9369b3 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -127,7 +127,9 @@ namespace pocketmine {
 	define("pocketmine\\ANSI", (Utils::getOS() !== "win" or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"]));
 
 
-	@mkdir(\pocketmine\DATA, 0777, true);
+	if(!file_exists(\pocketmine\DATA)){
+		mkdir(\pocketmine\DATA, 0777, true);
+	}
 
 	//Logger has a dependency on timezone, so we'll set it to UTC until we can get the actual timezone.
 	date_default_timezone_set("UTC");
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index cdaa49061..b76a55bd0 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -1458,9 +1458,17 @@ class Server{
 		$this->autoloader = $autoloader;
 		$this->logger = $logger;
 		$this->filePath = $filePath;
-		@mkdir($dataPath . "worlds/", 0777);
-		@mkdir($dataPath . "players/", 0777);
-		@mkdir($pluginPath, 0777);
+		if(!file_exists($dataPath . "worlds/")){
+			mkdir($dataPath . "worlds/", 0777);
+		}
+
+		if(!file_exists($dataPath . "players/")){
+			mkdir($dataPath . "players/", 0777);
+		}
+
+		if(!file_exists($pluginPath)){
+			mkdir($pluginPath, 0777);
+		}
 
 		$this->dataPath = realpath($dataPath) . DIRECTORY_SEPARATOR;
 		$this->pluginPath = realpath($pluginPath) . DIRECTORY_SEPARATOR;
diff --git a/src/pocketmine/command/defaults/TimingsCommand.php b/src/pocketmine/command/defaults/TimingsCommand.php
index 8bab24b82..60fdf2268 100644
--- a/src/pocketmine/command/defaults/TimingsCommand.php
+++ b/src/pocketmine/command/defaults/TimingsCommand.php
@@ -78,7 +78,10 @@ class TimingsCommand extends VanillaCommand{
 			$sampleTime = microtime(true) - self::$timingStart;
 			$index = 0;
 			$timingFolder = $sender->getServer()->getDataPath() . "timings/";
-			@mkdir($timingFolder, 0777);
+
+			if(!file_exists($timingFolder)){
+				mkdir($timingFolder, 0777);
+			}
 			$timings = $timingFolder . "timings.txt";
 			while(file_exists($timings)){
 				$timings = $timingFolder . "timings" . (++$index) . ".txt";
diff --git a/src/pocketmine/level/format/generic/BaseLevelProvider.php b/src/pocketmine/level/format/generic/BaseLevelProvider.php
index 93b57086f..ac46e8f28 100644
--- a/src/pocketmine/level/format/generic/BaseLevelProvider.php
+++ b/src/pocketmine/level/format/generic/BaseLevelProvider.php
@@ -42,7 +42,9 @@ abstract class BaseLevelProvider implements LevelProvider{
 	public function __construct(Level $level, $path){
 		$this->level = $level;
 		$this->path = $path;
-		@mkdir($this->path, 0777, true);
+		if(!file_exists($this->path)){
+			mkdir($this->path, 0777, true);
+		}
 		$nbt = new NBT(NBT::BIG_ENDIAN);
 		$nbt->readCompressed(file_get_contents($this->getPath() . "level.dat"));
 		$levelData = $nbt->getData();
diff --git a/src/pocketmine/level/format/leveldb/LevelDB.php b/src/pocketmine/level/format/leveldb/LevelDB.php
index a8bc803a8..3bc80f78f 100644
--- a/src/pocketmine/level/format/leveldb/LevelDB.php
+++ b/src/pocketmine/level/format/leveldb/LevelDB.php
@@ -47,7 +47,9 @@ class LevelDB extends BaseLevelProvider{
 	public function __construct(Level $level, $path){
 		$this->level = $level;
 		$this->path = $path;
-		@mkdir($this->path, 0777, true);
+		if(!file_exists($this->path)){
+			mkdir($this->path, 0777, true);
+		}
 		$nbt = new NBT(NBT::LITTLE_ENDIAN);
 		$nbt->read(substr(file_get_contents($this->getPath() . "level.dat"), 8));
 		$levelData = $nbt->getData();
@@ -87,8 +89,12 @@ class LevelDB extends BaseLevelProvider{
 	}
 
 	public static function generate($path, $name, $seed, $generator, array $options = []){
-		@mkdir($path, 0777, true);
-		@mkdir($path . "/db", 0777);
+		if(!file_exists($path)){
+			mkdir($path, 0777, true);
+		}
+		if(!file_exists($path . "/db")){
+			mkdir($path . "/db", 0777, true);
+		}
 		//TODO, add extra details
 		$levelData = new Compound(null, [
 			"hardcore" => new Byte("hardcore", 0),
diff --git a/src/pocketmine/level/format/mcregion/McRegion.php b/src/pocketmine/level/format/mcregion/McRegion.php
index a70e200bf..40217493c 100644
--- a/src/pocketmine/level/format/mcregion/McRegion.php
+++ b/src/pocketmine/level/format/mcregion/McRegion.php
@@ -72,8 +72,13 @@ class McRegion extends BaseLevelProvider{
 	}
 
 	public static function generate($path, $name, $seed, $generator, array $options = []){
-		@mkdir($path, 0777, true);
-		@mkdir($path . "/region", 0777);
+		if(!file_exists($path)){
+			mkdir($path, 0777, true);
+		}
+
+		if(!file_exists($path . "/region")){
+			mkdir($path . "/region", 0777);
+		}
 		//TODO, add extra details
 		$levelData = new Compound("Data", [
 			"hardcore" => new Byte("hardcore", 0),
diff --git a/src/pocketmine/plugin/PluginBase.php b/src/pocketmine/plugin/PluginBase.php
index 368d24139..19f3f70a7 100644
--- a/src/pocketmine/plugin/PluginBase.php
+++ b/src/pocketmine/plugin/PluginBase.php
@@ -202,7 +202,9 @@ abstract class PluginBase implements Plugin{
 
 		$out = $this->dataFolder . $filename;
 		if(!file_exists($this->dataFolder)){
-			@mkdir($this->dataFolder, 0755, true);
+			if(!file_exists($this->dataFolder)){
+				mkdir($this->dataFolder, 0755, true);
+			}
 		}
 
 		if(file_exists($out) and $replace !== true){