Merge branch 'master' into PM1E

# Conflicts: # .circleci/config.yml
lt-name · Jun 3, 2023 · f9f5181 · f9f5181
2 parents 7be37db + 6f4f930
commit f9f5181
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 39 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/src/main/java/cn/lanink/murdermystery/listener/defaults/DefaultChatListener.java b/src/main/java/cn/lanink/murdermystery/listener/defaults/DefaultChatListener.java
@@ -29,7 +29,11 @@ public void onCommandPreprocess(PlayerCommandPreprocessEvent event) {
         if (player == null || message == null) {
             return;
         }
-        message = message.replace("/", "").split(" ")[0];
+        String[] split = message.replace("/", "").split(" ");
+        if (split.length == 0) {
+            return;
+        }
+        message = split[0];
         BaseRoom room = this.getListenerRooms().get(player.getLevel().getFolderName());
         if (room == null || !room.isPlaying(player)) {
             return;