Merge branch 'dev/4.0'

fuyutsuki · Apr 3, 2021 · 2410872 · 2410872
2 parents 3238e07 + d5e1d77
commit 2410872
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 27 deletions.
diff --git a/.github/changelogs/4.x/en_us.md b/.github/changelogs/4.x/en_us.md
@@ -2,6 +2,13 @@
 
 ## 4.0.x
 
+### 4.0.3
+
+#### :bug: Bug fix
+
+- Fixed a bug that caused the server to crash when performing certain operations.  
+  Credits: BlitzGames(UK), MCBEPU(CN), OneMine Хаб(RU), Sulfuritium(FR), YukioLifeServer(JP), GrieferSucht(DE), HayalCraft
+
 ### 4.0.2
 
 #### :bug: Bug fix
@@ -14,7 +21,6 @@
 
 - Translated by @TobyDev265: Added Vietnamese
 
-
 ### 4.0.0
 
 #### :sparkles: New Features

diff --git a/.github/changelogs/4.x/ja_jp.md b/.github/changelogs/4.x/ja_jp.md
@@ -2,6 +2,13 @@
 
 ## 4.0.x
 
+### 4.0.3
+
+#### :bug: バグ修正
+
+- 特定の操作をした際にサーバーがクラッシュするバグを修正しました  
+  クレジット: BlitzGames(UK), MCBEPU(CN), OneMine Хаб(RU), Sulfuritium(FR), YukioLifeServer(JP), GrieferSucht(DE), HayalCraft
+
 ### 4.0.2
 
 #### :bug: バグ修正
@@ -14,7 +21,6 @@
 
 - @TobyDev265による翻訳: ベトナム語 を追加しました
 
-
 ### 4.0.0
 
 #### ✨ 新機能

diff --git a/plugin.yml b/plugin.yml
@@ -1,7 +1,7 @@
 name: Texter
 prefix: Texter
 main: jp\mcbe\fuyutsuki\Texter\Main
-version: 4.0.2
+version: 4.0.3
 api: 3.15.0 # pmmp/PocketMine-MP
 mcpe-protocol:
   - 408 # 1.16.20

diff --git a/src/jp/mcbe/fuyutsuki/Texter/EventListener.php b/src/jp/mcbe/fuyutsuki/Texter/EventListener.php
@@ -27,22 +27,20 @@
 
 namespace jp\mcbe\fuyutsuki\Texter;
 
-use jp\mcbe\fuyutsuki\Texter\{
-	command\TexterCommand,
-	data\FloatingTextData,
-	i18n\TexterLang,
-	task\SendTextsTask,
-	text\SendType};
-use pocketmine\{
-	event\entity\EntityLevelChangeEvent,
-	event\level\LevelInitEvent,
-	event\Listener,
-	event\player\PlayerJoinEvent,
-	event\server\DataPacketSendEvent,
-	network\mcpe\protocol\AvailableCommandsPacket,
-	network\mcpe\protocol\ProtocolInfo,
-	Player,
-	plugin\Plugin};
+use jp\mcbe\fuyutsuki\Texter\command\TexterCommand;
+use jp\mcbe\fuyutsuki\Texter\data\FloatingTextData;
+use jp\mcbe\fuyutsuki\Texter\i18n\TexterLang;
+use jp\mcbe\fuyutsuki\Texter\task\SendTextsTask;
+use jp\mcbe\fuyutsuki\Texter\text\SendType;
+use pocketmine\event\entity\EntityLevelChangeEvent;
+use pocketmine\event\level\LevelLoadEvent;
+use pocketmine\event\Listener;
+use pocketmine\event\player\PlayerJoinEvent;
+use pocketmine\event\server\DataPacketSendEvent;
+use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
+use pocketmine\network\mcpe\protocol\ProtocolInfo;
+use pocketmine\Player;
+use pocketmine\plugin\Plugin;
 
 /**
  * Class EventListener
@@ -64,11 +62,13 @@ public function onJoinPlayer(PlayerJoinEvent $ev) {
 		$this->plugin->getScheduler()->scheduleDelayedRepeatingTask($sendTask, SendTextsTask::DELAY_TICKS, SendTextsTask::TICKING_PERIOD);
 	}
 
-	public function onInitLevel(LevelInitEvent $ev) {
+	public function onLoadLevel(LevelLoadEvent $ev) {
 		$folderName = $ev->getLevel()->getFolderName();
-		$floatingTextData = new FloatingTextData($this->plugin, $folderName);
-		$floatingTextData->generateFloatingTexts($this->plugin);
-		$this->plugin->getLogger()->debug("Loaded FloatingTextCluster file: {$folderName}.json");
+		if (FloatingTextData::getInstance($folderName) === null) {
+			$floatingTextData = new FloatingTextData($this->plugin, $folderName);
+			$floatingTextData->generateFloatingTexts($this->plugin);
+			$this->plugin->getLogger()->debug("Loaded FloatingTextCluster file: {$folderName}.json");
+		}
 	}
 
 	public function onEntityLevelChange(EntityLevelChangeEvent $ev) {

diff --git a/src/jp/mcbe/fuyutsuki/Texter/task/PrepareTextsTask.php b/src/jp/mcbe/fuyutsuki/Texter/task/PrepareTextsTask.php
@@ -50,10 +50,12 @@ public function onRun(int $currentTick) {
 		if (empty($this->remain)) {
 			$this->onSuccess();
 		}else {
-			$name = array_shift($this->names);
+			$name = (string) array_shift($this->names);
 			$value = array_shift($this->remain);
-			$floatingText = FloatingTextCluster::fromArray($name, $value);
-			$this->data->store($floatingText, true);
+			if (is_array($value)) {
+				$floatingText = FloatingTextCluster::fromArray($name, $value);
+				$this->data->store($floatingText, true);
+			}
 		}
 	}
 

diff --git a/src/jp/mcbe/fuyutsuki/Texter/task/SendTextsTask.php b/src/jp/mcbe/fuyutsuki/Texter/task/SendTextsTask.php
@@ -39,7 +39,7 @@ public function __construct(Plugin $plugin, Player $target, Level $sendTo, SendT
 		$this->sendTo = $sendTo;
 		$this->type = $type;
 		$data = FloatingTextData::getInstance($sendTo->getFolderName());
-		$this->remain = $data->floatingTexts();
+		$this->remain = $data !== null ? $data->floatingTexts() : [];
 	}
 
 	public function onRun(int $currentTick) {