From 35c7bf2161bb5303c919a91e61f58c23fc499436 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Sun, 21 Jan 2024 22:35:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/bukkit/util/CoreBukkitUtils.java     | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
index 0333627..bebed26 100644
--- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
+++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
@@ -14,7 +14,6 @@ import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.command.CommandException;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Entity;
@@ -391,30 +390,29 @@ public final class CoreBukkitUtils {
             command = PlaceholderAPI.setPlaceholders(player, command);
         }
         String[] split = command.split(":", 2);
-        try {
-            switch (split[0]) {
-                case "player": {
-                    Bukkit.dispatchCommand(player, split[1]);
-                    break;
-                }
-                case "console": {
-                    Bukkit.dispatchCommand(Bukkit.getConsoleSender(), split[1]);
-                    break;
-                }
-                case "op": {
-                    boolean op = player.isOp();
-                    player.setOp(true);
-                    Bukkit.dispatchCommand(player, split[1]);
-                    player.setOp(op);
-                    break;
-                }
-                default: {
-                    Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
-                    break;
-                }
+        switch (split[0]) {
+            case "player": {
+                Bukkit.dispatchCommand(player, split[1]);
+                break;
+            }
+            case "console": {
+                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), split[1]);
+                break;
+            }
+            case "op": {
+                boolean op = player.isOp();
+                player.setOp(true);
+                try {
+                    Bukkit.dispatchCommand(player, split[1]);
+                } finally {
+                    player.setOp(op);
+                }
+                break;
+            }
+            default: {
+                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+                break;
             }
-        } catch (CommandException e) {
-            e.printStackTrace();
         }
     }