Skip to content

Commit 90d4716

Browse files
committed
更新检查类优化
1 parent d0964ce commit 90d4716

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

src/main/java/com/hzzz/points/listeners/DeathListener.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.hzzz.points.listeners;
22

3-
import com.hzzz.points.Points;
43
import com.hzzz.points.listeners.base_listener.HowieUtilsListener;
54
import net.kyori.adventure.text.Component;
65
import net.kyori.adventure.text.format.NamedTextColor;
7-
import org.bukkit.Bukkit;
86
import org.bukkit.entity.Player;
97
import org.bukkit.event.EventHandler;
108
import org.bukkit.event.entity.PlayerDeathEvent;
119

12-
import java.util.concurrent.ExecutionException;
13-
import java.util.concurrent.Future;
10+
import java.sql.SQLException;
1411

1512
import static com.hzzz.points.data_manager.operations_utils.DeathLog.insertDeathLog;
1613
import static com.hzzz.points.data_manager.operations_utils.DeathMessageConfig.isEnableDeathMessage;
@@ -61,26 +58,25 @@ public void onPlayerDeath(PlayerDeathEvent e) {
6158
if (!checkPermissionOneConfigNode(player, "death.message.listener", "points.listener.death.message")) {
6259
return;
6360
}
64-
65-
if (config.getBoolean("death.message.enable", false)) { // 出现错误默认不发送死亡消息
66-
Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(Points.getInstance(), () -> isEnableDeathMessage(player));
61+
runTaskAsynchronously(() -> {
62+
// isEnableDeathMessage insertDeathLog需要异步
6763
try {
68-
if (future.get()) {
64+
if (config.getBoolean("death.message.enable", false) && isEnableDeathMessage(player)) { // 出现错误默认不发送死亡消息
6965
// 生成并发送消息给执行者
7066
player.sendMessage(buildPlayerCoordinatesMessage("death.message", player, " X-> ", NamedTextColor.RED));
7167
}
72-
} catch (InterruptedException | ExecutionException ex) {
68+
} catch (SQLException ex) {
7369
ex.printStackTrace();
7470
}
75-
}
7671

77-
// 记录死亡日志
78-
if (config.getBoolean("death.log.enable", false)) {
79-
Component deathMessage = e.deathMessage();
80-
if (deathMessage == null) { // 被手动设置deathMessage才可能为null吧
81-
return;
72+
// 记录死亡日志
73+
if (config.getBoolean("death.log.enable", false)) {
74+
Component deathMessage = e.deathMessage();
75+
if (deathMessage == null) { // 被手动设置deathMessage才可能为null吧
76+
return;
77+
}
78+
insertDeathLog(player, deathMessage.toString(), config.getInt("death.log.record-limit", 5));
8279
}
83-
runTaskAsynchronously(() -> insertDeathLog(player, deathMessage.toString(), config.getInt("death.log.record-limit", 5)));
84-
}
80+
});
8581
}
8682
}

0 commit comments

Comments
 (0)