Remove unused leftovers

inxomnyaa · Dec 25, 2020 · 51be977 · 51be977
1 parent ae3500d
commit 51be977
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 138 deletions.
diff --git a/src/xenialdan/MagicWE2/commands/generation/CylinderCommand.php b/src/xenialdan/MagicWE2/commands/generation/CylinderCommand.php
@@ -54,32 +54,23 @@ public function onRun(CommandSender $sender, string $aliasUsed, array $args): vo
 			}
 		}
 		if (!$sender instanceof Player) {
-            $sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
-            return;
-        }
-        /** @var Player $sender */
-        try {
-			$messages = [];
-			$error = false;
+			$sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
+			return;
+		}
+		/** @var Player $sender */
+		try {
 			$blocks = $args["blocks"];
 			$diameter = (int)$args["diameter"];
 			$height = (int)($args["height"] ?? 1);
-			foreach ($messages as $message) {
-				$sender->sendMessage($message);
-			}
-			if (!$error) {
-				$session = SessionHelper::getUserSession($sender);
-				if (is_null($session)) {
-					throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
-				}
-				$cyl = new Cylinder($sender->getPosition()->asVector3()->floor(), $height, $diameter);
-				$cylSelection = new Selection($session->getUUID(), $sender->getWorld());
-				$cylSelection->setShape($cyl);
-				$hasFlags = isset($args["flags"]);
-				API::fillAsync($cylSelection, $session, $blocks, $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
-			} else {
-				throw new InvalidArgumentException("Could not fill with the selected blocks");
+			$session = SessionHelper::getUserSession($sender);
+			if (is_null($session)) {
+				throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
 			}
+			$cyl = new Cylinder($sender->getPosition()->asVector3()->floor(), $height, $diameter);
+			$cylSelection = new Selection($session->getUUID(), $sender->getWorld());
+			$cylSelection->setShape($cyl);
+			$hasFlags = isset($args["flags"]);
+			API::fillAsync($cylSelection, $session, $blocks, $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
 		} catch (Exception $error) {
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $lang->translateString('error.command-error'));
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $error->getMessage());

diff --git a/src/xenialdan/MagicWE2/commands/region/OverlayCommand.php b/src/xenialdan/MagicWE2/commands/region/OverlayCommand.php
@@ -36,47 +36,37 @@ protected function prepare(): void
 	 * @param string $aliasUsed
 	 * @param mixed[] $args
 	 */
-    public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
-    {
-        $lang = Loader::getInstance()->getLanguage();
-        if ($sender instanceof Player && SessionHelper::hasSession($sender)) {
-            try {
-                $lang = SessionHelper::getUserSession($sender)->getLanguage();
-            } catch (SessionException $e) {
-            }
-        }
-        if (!$sender instanceof Player) {
-            $sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
-            return;
-        }
-        /** @var Player $sender */
-        try {
-			$messages = [];
-			$error = false;
-			$blocks = $args["blocks"];
-			foreach ($messages as $message) {
-				$sender->sendMessage($message);
+	public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
+	{
+		$lang = Loader::getInstance()->getLanguage();
+		if ($sender instanceof Player && SessionHelper::hasSession($sender)) {
+			try {
+				$lang = SessionHelper::getUserSession($sender)->getLanguage();
+			} catch (SessionException $e) {
+			}
+		}
+		if (!$sender instanceof Player) {
+			$sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
+			return;
+		}
+		/** @var Player $sender */
+		try {
+			//$blocks = $args["blocks"];//TODO reenable when used
+			$session = SessionHelper::getUserSession($sender);
+			if (is_null($session)) {
+				throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
+			}
+			$selection = $session->getLatestSelection();
+			if (is_null($selection)) {
+				throw new SelectionException($lang->translateString('error.noselection'));
+			}
+			if (!$selection->isValid()) {
+				throw new SelectionException($lang->translateString('error.selectioninvalid'));
 			}
-			$return = !$error;
-			if ($return) {
-				$session = SessionHelper::getUserSession($sender);
-				if (is_null($session)) {
-					throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
-				}
-				$selection = $session->getLatestSelection();
-                if (is_null($selection)) {
-					throw new SelectionException($lang->translateString('error.noselection'));
-                }
-                if (!$selection->isValid()) {
-					throw new SelectionException($lang->translateString('error.selectioninvalid'));
-                }
-                if ($selection->getWorld() !== $sender->getWorld()) {
-					$sender->sendMessage(Loader::PREFIX . TF::GOLD . $lang->translateString('warning.differentworld'));
-				}
-				#API::overlayReplaceAsync($selection, $session, [], $blocks, API::flagParser(explode(" ", strval($args["flags"]))));
-			} else {
-				throw new InvalidArgumentException("Could not replace with the selected blocks");
+			if ($selection->getWorld() !== $sender->getWorld()) {
+				$sender->sendMessage(Loader::PREFIX . TF::GOLD . $lang->translateString('warning.differentworld'));
 			}
+			#API::overlayReplaceAsync($selection, $session, [], $blocks, API::flagParser(explode(" ", strval($args["flags"]))));
 		} catch (Exception $error) {
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $lang->translateString('error.command-error'));
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $error->getMessage());

diff --git a/src/xenialdan/MagicWE2/commands/region/ReplaceCommand.php b/src/xenialdan/MagicWE2/commands/region/ReplaceCommand.php
@@ -40,49 +40,39 @@ protected function prepare(): void
 	 * @param string $aliasUsed
 	 * @param mixed[] $args
 	 */
-    public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
-    {
-        $lang = Loader::getInstance()->getLanguage();
-        if ($sender instanceof Player && SessionHelper::hasSession($sender)) {
-            try {
-                $lang = SessionHelper::getUserSession($sender)->getLanguage();
-            } catch (SessionException $e) {
-            }
-        }
-        if (!$sender instanceof Player) {
-            $sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
-            return;
-        }
-        /** @var Player $sender */
-        try {
-			$messages = [];
-			$error = false;
+	public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
+	{
+		$lang = Loader::getInstance()->getLanguage();
+		if ($sender instanceof Player && SessionHelper::hasSession($sender)) {
+			try {
+				$lang = SessionHelper::getUserSession($sender)->getLanguage();
+			} catch (SessionException $e) {
+			}
+		}
+		if (!$sender instanceof Player) {
+			$sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
+			return;
+		}
+		/** @var Player $sender */
+		try {
 			$findBlocks = $args["findblocks"];
 			$replaceBlocks = $args["replaceblocks"];
-			foreach ($messages as $message) {
-				$sender->sendMessage($message);
+			$session = SessionHelper::getUserSession($sender);
+			if (is_null($session)) {
+				throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
+			}
+			$selection = $session->getLatestSelection();
+			if (is_null($selection)) {
+				throw new SelectionException($lang->translateString('error.noselection'));
+			}
+			if (!$selection->isValid()) {
+				throw new SelectionException($lang->translateString('error.selectioninvalid'));
 			}
-			$return = !$error;
-			if ($return) {
-				$session = SessionHelper::getUserSession($sender);
-				if (is_null($session)) {
-					throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
-				}
-				$selection = $session->getLatestSelection();
-				if (is_null($selection)) {
-					throw new SelectionException($lang->translateString('error.noselection'));
-				}
-				if (!$selection->isValid()) {
-					throw new SelectionException($lang->translateString('error.selectioninvalid'));
-				}
-				if ($selection->getWorld() !== $sender->getWorld()) {
-					$sender->sendMessage(Loader::PREFIX . TF::GOLD . $lang->translateString('warning.differentworld'));
-				}
-				$hasFlags = isset($args["flags"]);
-				API::replaceAsync($selection, $session, $findBlocks, $replaceBlocks, $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
-			} else {
-				throw new InvalidArgumentException("Could not replace with the selected blocks");
+			if ($selection->getWorld() !== $sender->getWorld()) {
+				$sender->sendMessage(Loader::PREFIX . TF::GOLD . $lang->translateString('warning.differentworld'));
 			}
+			$hasFlags = isset($args["flags"]);
+			API::replaceAsync($selection, $session, $findBlocks, $replaceBlocks, $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
 		} catch (Exception $error) {
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $lang->translateString('error.command-error'));
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $error->getMessage());

diff --git a/src/xenialdan/MagicWE2/commands/region/SetCommand.php b/src/xenialdan/MagicWE2/commands/region/SetCommand.php
@@ -39,47 +39,38 @@ protected function prepare(): void
 	 * @param string $aliasUsed
 	 * @param mixed[] $args
 	 */
-    public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
-    {
-        $lang = Loader::getInstance()->getLanguage();
-        if ($sender instanceof Player && SessionHelper::hasSession($sender)) {
-            try {
-                $lang = SessionHelper::getUserSession($sender)->getLanguage();
-            } catch (SessionException $e) {
-            }
-        }
-        if (!$sender instanceof Player) {
-            $sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
-            return;
-        }
-        /** @var Player $sender */
-        try {
-			$messages = [];
-			$error = false;
+	public function onRun(CommandSender $sender, string $aliasUsed, array $args): void
+	{
+		$lang = Loader::getInstance()->getLanguage();
+		if ($sender instanceof Player && SessionHelper::hasSession($sender)) {
+			try {
+				$lang = SessionHelper::getUserSession($sender)->getLanguage();
+			} catch (SessionException $e) {
+			}
+		}
+		if (!$sender instanceof Player) {
+			$sender->sendMessage(TF::RED . $lang->translateString('error.runingame'));
+			return;
+		}
+		/** @var Player $sender */
+		try {
 			$replaceBlocks = $args["blocks"];
-			foreach ($messages as $message) {
-				$sender->sendMessage($message);
+			$session = SessionHelper::getUserSession($sender);
+			if (is_null($session)) {
+				throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
+			}
+			$selection = $session->getLatestSelection();
+			if (is_null($selection)) {
+				throw new SelectionException($lang->translateString('error.noselection'));
+			}
+			if (!$selection->isValid()) {
+				throw new SelectionException($lang->translateString('error.selectioninvalid'));
 			}
-			if (!$error) {
-				$session = SessionHelper::getUserSession($sender);
-				if (is_null($session)) {
-					throw new SessionException($lang->translateString('error.nosession', [Loader::getInstance()->getName()]));
-				}
-				$selection = $session->getLatestSelection();
-				if (is_null($selection)) {
-					throw new SelectionException($lang->translateString('error.noselection'));
-				}
-				if (!$selection->isValid()) {
-					throw new SelectionException($lang->translateString('error.selectioninvalid'));
-				}
-				if ($selection->getWorld() !== $sender->getWorld()) {
-					$sender->sendMessage(Loader::PREFIX . TF::GOLD . $lang->translateString('warning.differentworld'));
-				}
-				$hasFlags = isset($args["flags"]);
-				API::fillAsync($selection, $session, $replaceBlocks, $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
-			} else {
-				throw new InvalidArgumentException("Could not fill with the selected blocks");
+			if ($selection->getWorld() !== $sender->getWorld()) {
+				$sender->sendMessage(Loader::PREFIX . TF::GOLD . $lang->translateString('warning.differentworld'));
 			}
+			$hasFlags = isset($args["flags"]);
+			API::fillAsync($selection, $session, $replaceBlocks, $hasFlags ? API::flagParser(explode(" ", (string)$args["flags"])) : API::FLAG_BASE);
 		} catch (Exception $error) {
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $lang->translateString('error.command-error'));
 			$sender->sendMessage(Loader::PREFIX . TF::RED . $error->getMessage());