Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

.gitea/workflows/build.yml

@@ -15,10 +15,10 @@ jobs:
           fetch-depth: 0
       - name: "Set up Maven"
         uses: https://ssl.lunadeer.cn:14446/actions/setup-maven@v4
-      - name: "Set up JDK 17"
+      - name: "Set up JDK 21"
         uses: https://ssl.lunadeer.cn:14446/actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: maven
       - name: "Build with Maven"

pom.xml

@@ -80,7 +80,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21.1-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/cn/lunadeer/essentialsd/commands/warp/DelWarp.java

@@ -3,7 +3,6 @@ package cn.lunadeer.essentialsd.commands.warp;
 import cn.lunadeer.essentialsd.dtos.WarpPoint;
 import cn.lunadeer.minecraftpluginutils.Notification;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.jetbrains.annotations.NotNull;
@@ -18,6 +17,10 @@ public class DelWarp implements TabExecutor {
      */
     @Override
     public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
+        if (strings.length != 1) {
+            Notification.error(commandSender, "用法: /delwarp <name>");
+            return true;
+        }
         WarpPoint point = WarpPoint.selectByName(strings[0]);
         if (point == null) {
             Notification.error(commandSender, "传送点 %s 不存在", strings[0]);

src/main/java/cn/lunadeer/essentialsd/commands/warp/Warp.java

@@ -2,10 +2,8 @@ package cn.lunadeer.essentialsd.commands.warp;
 
 import cn.lunadeer.essentialsd.EssentialsD;
 import cn.lunadeer.essentialsd.dtos.WarpPoint;
-import cn.lunadeer.essentialsd.managers.TeleportManager;
 import cn.lunadeer.minecraftpluginutils.Notification;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
@@ -26,6 +24,10 @@ public class Warp implements TabExecutor {
             return true;
         }
         Player player = (Player) commandSender;
+        if (strings.length != 1) {
+            Notification.error(commandSender, "用法: /warp <name>");
+            return true;
+        }
         WarpPoint point = WarpPoint.selectByName(strings[0]);
         if (point == null) {
             Notification.error(commandSender, "传送点 %s 不存在", strings[0]);

src/main/java/cn/lunadeer/essentialsd/events/ChatPrefixEvent.java

@@ -1,19 +1,19 @@
 package cn.lunadeer.essentialsd.events;
 
 import cn.lunadeer.essentialsd.EssentialsD;
-import io.papermc.paper.event.player.AsyncChatEvent;
 import me.clip.placeholderapi.PlaceholderAPI;
-import net.kyori.adventure.text.Component;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 public class ChatPrefixEvent implements Listener {
 
     @EventHandler
-    public void onChat(AsyncChatEvent event) {
+    public void onChat(AsyncPlayerChatEvent event) {
         event.setCancelled(true);
         String formated = PlaceholderAPI.setPlaceholders(event.getPlayer(), EssentialsD.config.getPrefixChatFormat());
-        EssentialsD.instance.getServer().sendMessage(Component.text(formated).append(event.message()));
+        formated += event.getMessage();
+        EssentialsD.instance.getServer().broadcastMessage(formated);
     }
 
 }