merge: 合并 Gitee 远程提交,保留本地新增优惠券/订单管理功能

This commit is contained in:
ypsdf1
2026-05-26 15:45:58 +08:00
2 changed files with 91 additions and 38 deletions
@@ -111,39 +111,34 @@ public class RadioDownloadListener
}
private void handleFailure(Player p, UUID uuid) {
int failNum = failCount.getOrDefault(
uuid, 0) + 1;
int failNum = failCount.getOrDefault(uuid, 0) + 1;
failCount.put(uuid, failNum);
log.warning("[Radio] " + p.getName()
+ " 失败次数: " + failNum
+ "/" + MAX_FAILED);
+ " 失败次数: " + failNum + "/" + MAX_FAILED);
if (failNum >= MAX_FAILED) {
blocked.put(uuid, true);
log.severe("[Radio] " + p.getName()
+ " 达到最大失败,停止重试");
p.sendMessage(
"§e§l[Radio] 资源包加载失败"
+ ",部分音频可能异常");
p.sendMessage(
"§d§l若想重试,请退出重进");
+ " 已达最大失败次数,停止重试,"
+ "玩家继续留在服务器");
// 不踢出,只记录熔断,玩家正常游玩
p.sendMessage("§e§l[Radio] 资源包加载失败"
+ ",跳过资源包,部分画面、音频可能出现问题"
+ "§d§l若想继续下载,请退出重进");
return;
}
// 打了包没测试
p.sendMessage("§e§l[Radio] 下载失败,"
+ "第 " + failNum + " 次重试"
+ " (" + failNum + "/"
+ +MAX_FAILED + ")");
+ "重试... (" + failNum + "/" + MAX_FAILED + ")");
// ★ 3秒后重试(之前是5秒)
// 5秒后重试
Bukkit.getScheduler()
.runTaskLater(plugin, () -> {
if (p.isOnline()
&& plugin.radio != null) {
plugin.radio
.sendResourcePack(p);
if (p.isOnline() && plugin.radio != null) {
plugin.radio.sendResourcePack(p);
}
}, 60L);
}, 100L);
}
}