fix sessions

ProkitsNetwork · Jun 16, 2023 · 4c1ee1e · 4c1ee1e
1 parent 85245fe
commit 4c1ee1e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/blackjack200/worldsx/command/GameRuleCommand.php b/src/blackjack200/worldsx/command/GameRuleCommand.php
@@ -46,7 +46,7 @@ public function execute(CommandSender $sender, string $commandLabel, array $args
 			}
 
 			[$name, $value] = $args;
-			$world = WorldUtil::findWorldByFolderName($worldName);
+			$world = WorldUtil::findWorldByFolderName($worldName, true);
 			if ($world === null) {
 				$sender->sendMessage($this->lang->translateString('command.gamerule.world-not-exists', [$worldName]));
 				return;

diff --git a/src/blackjack200/worldsx/command/subcommand/impl/LoadSubCommand.php b/src/blackjack200/worldsx/command/subcommand/impl/LoadSubCommand.php
@@ -3,6 +3,7 @@
 namespace blackjack200\worldsx\command\subcommand\impl;
 
 use blackjack200\worldsx\command\subcommand\SubCommand;
+use blackjack200\worldsx\session\WorldGameRules;
 use blackjack200\worldsx\world\WorldUtil;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
@@ -18,7 +19,8 @@ public function execute(CommandSender $sender, array $args) : void {
 			$this->mustSendTranslation($sender, 'command.load.loaded', [$worldName]);
 		} else {
 			try {
-				WorldUtil::loadWorld($worldName);
+				$w = WorldUtil::loadWorld($worldName);
+				var_dump(WorldGameRules::mustGetGameRuleCollection($w));
 				$this->mustSendTranslation($sender, 'command.load.success', [$worldName]);
 			} catch (Throwable $thr) {
 				$this->mustSendTranslation($sender, 'command.load.error', [$worldName, $thr->getMessage()]);

diff --git a/src/blackjack200/worldsx/world/GameRuleUtil.php b/src/blackjack200/worldsx/world/GameRuleUtil.php
@@ -17,6 +17,7 @@ public static function parse(BaseNbtWorldData $data) : ?GameRuleCollection {
 	}
 
 	public static function save(BaseNbtWorldData $data, GameRuleCollection $rules) : void {
+		var_dump($rules);
 		$data->getCompoundTag()->setTag('GameRules', $rules->toCompoundTag());
 		$data->save();
 	}

diff --git a/src/blackjack200/worldsx/world/WorldUtil.php b/src/blackjack200/worldsx/world/WorldUtil.php
@@ -11,15 +11,18 @@
 use Symfony\Component\Filesystem\Path;
 
 class WorldUtil {
-	public static function findWorldByFolderName(string $name) : ?World {
+	public static function findWorldByFolderName(string $name, bool $tryLoad = false) : ?World {
 		// Assume that folderName is unique
 		$worlds = Server::getInstance()->getWorldManager()->getWorlds();
 		foreach ($worlds as $world) {
 			if ($world->getFolderName() === $name) {
 				return $world;
 			}
 		}
-		return self::tryLoadWorld($name);
+		if($tryLoad) {
+			return self::tryLoadWorld($name);
+		}
+		return null;
 	}
 
 	public static function unloadWorldByFolderName(string $name) : void {