From 57c1c756852ad5f9bddbafc6c4c8c5d578af5baf Mon Sep 17 00:00:00 2001
From: 502647092 <admin@yumc.pw>
Date: Wed, 7 Sep 2016 22:54:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtitle=E4=B8=BAnull?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=20=E4=BF=AE=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 502647092 <admin@yumc.pw>
---
 pom.xml                                                   | 2 +-
 src/main/java/pw/yumc/MiaoBoard/misc/Replace.java         | 8 +++++---
 .../pw/yumc/MiaoBoard/scoreboard/core/SidebarBoard.java   | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34f708b..bbda461 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>pw.yumc</groupId>
 	<artifactId>MiaoBoard</artifactId>
-	<version>2.0</version>
+	<version>2.1</version>
 	<name>MiaoBoard</name>
 	<description>喵式记分板</description>
 	<build>
diff --git a/src/main/java/pw/yumc/MiaoBoard/misc/Replace.java b/src/main/java/pw/yumc/MiaoBoard/misc/Replace.java
index 3c285e0..bf57022 100644
--- a/src/main/java/pw/yumc/MiaoBoard/misc/Replace.java
+++ b/src/main/java/pw/yumc/MiaoBoard/misc/Replace.java
@@ -4,6 +4,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -18,10 +19,11 @@ import pw.yumc.YumCore.bukkit.compatible.C;
 
 public class Replace {
     public static List<String> $(final Player p, final List<String> text) {
-        for (int i = 0; i < text.size(); i++) {
-            text.set(i, $(p, text.get(i)));
+        final List<String> temp = new LinkedList<>();
+        for (final String i : text) {
+            temp.add($(p, i));
         }
-        return text;
+        return temp;
     }
 
     public static String $(final Player p, final String text) {
diff --git a/src/main/java/pw/yumc/MiaoBoard/scoreboard/core/SidebarBoard.java b/src/main/java/pw/yumc/MiaoBoard/scoreboard/core/SidebarBoard.java
index 9bf6792..ca4f384 100644
--- a/src/main/java/pw/yumc/MiaoBoard/scoreboard/core/SidebarBoard.java
+++ b/src/main/java/pw/yumc/MiaoBoard/scoreboard/core/SidebarBoard.java
@@ -47,7 +47,8 @@ public class SidebarBoard extends Board {
         String title = null;
         if (this.getUpdateFunction().getTitleFunction() != null) {
             title = this.getUpdateFunction().getTitleFunction().run(player);
-        } else {
+        }
+        if (title == null) {
             this.removeTarget(player);
             return;
         }