Merge branch 'dev/4.1'

fuyutsuki · Aug 24, 2022 · e9be444 · e9be444
2 parents adcf79d + d5274de
commit e9be444
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/.github/changelogs/4.x/en_us.md b/.github/changelogs/4.x/en_us.md
@@ -2,6 +2,12 @@
 
 ## 4.1.x
 
+### 4.1.6
+
+#### :bug: バグ修正
+
+- Fixed server crash when editing floating texts (#130)
+
 ### 4.1.5
 
 #### :bug: bug fixes

diff --git a/.github/changelogs/4.x/ja_jp.md b/.github/changelogs/4.x/ja_jp.md
@@ -2,6 +2,12 @@
 
 ## 4.1.x
 
+### 4.1.6
+
+#### :bug: バグ修正
+
+- 浮き文字の編集時にサーバーがクラッシュする問題を修正しました (#130)
+
 ### 4.1.5
 
 #### :bug: バグ修正

diff --git a/plugin.yml b/plugin.yml
@@ -1,7 +1,7 @@
 name: Texter
 prefix: Texter
 main: jp\mcbe\fuyutsuki\Texter\Main
-version: 4.1.5
+version: 4.1.6
 api: 4.7.0
 softdepend:
   # aieuo/Mineflow

diff --git a/src/jp/mcbe/fuyutsuki/Texter/command/form/AddFloatingTextForm.php b/src/jp/mcbe/fuyutsuki/Texter/command/form/AddFloatingTextForm.php
@@ -10,6 +10,7 @@
 use dktapps\pmforms\element\Label;
 use dktapps\pmforms\element\StepSlider;
 use dktapps\pmforms\element\Toggle;
+use Exception;
 use jp\mcbe\fuyutsuki\Texter\data\FloatingTextData;
 use jp\mcbe\fuyutsuki\Texter\i18n\TexterLang;
 use jp\mcbe\fuyutsuki\Texter\Main;
@@ -95,7 +96,11 @@ function(Player $player): void {
 	}
 
 	private function handleSubmit(Player $player, CustomFormResponse $response): void {
-		$this->session->setName($response->getString(FormLabels::NAME));
+		try {
+			$name = $response->getString(FormLabels::NAME);
+			$this->session->setName($name);
+		}catch (Exception $_) {}
+
 		$texts = $this->session->texts();
 		$this->session->setTexts([]);