youpaishidifu/Sdf1_login
1
1
Fork 0
Code Issues 15 Pull Requests Actions 1 Packages Projects Releases 13 Wiki Activity

第33批十一次修正：接双箱固定顺序改4独立Location方位偏置+全被占回退27格单箱 + clearChestBlock加固防双箱回弹(清后2tick再清一次)
Check Source / check (push) Successful in 4s
Details
Auto Release / build (push) Successful in 2m46s
Details
Simple Test / test (push) Successful in 1s
Details
Test Env / test (push) Successful in 1s
Details

Browse Source
This commit is contained in:
youpaishidifu
2026-10-18 13:04:48 +08:00
parent 3635a0c3ae
commit aca8c31cc7
1 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/Sdf1_login/ChestCarryManager.java
+43 -32
View File
@@ -458,42 +458,41 @@ public class ChestCarryManager implements Listener {
if (slotCount > 27) { if (slotCount > 27) {
World w = placed.getWorld(); World w = placed.getWorld();
int px = placed.getX(), py = placed.getY(), pz = placed.getZ(); int px = placed.getX(), py = placed.getY(), pz = placed.getZ();
// 优先四向接已有邻接木箱（共用 54 格库存）；否则在空气位放第二个 // ★ 33批十一次修正：固定顺序四向遍历（东→西→南→北）命中第一个就 break，
Block[][] cands = { // 朝玩家方向有方块时顶到 → 物品散落一地。改为：
{w.getBlockAt(px + 1, py, pz), w.getBlockAt(px - 1, py, pz)}, // ① 四向找空气位/接木箱时，朝玩家最近方向优先（方位差最小）
{w.getBlockAt(px, py, pz + 1), w.getBlockAt(px, py, pz - 1)}, // ② 全被占 → 不硬接双箱，回退 27 格单箱（塞满 27 + 剩余掉箱子旁）
};
boolean connected = false; boolean connected = false;
Block twinBlock = null; Block twinBlock = null;
for (Block[] row : cands) { Location d1 = new Location(w, px + 1, py, pz); // 东
for (Block c : row) { Location d2 = new Location(w, px - 1, py, pz); // 西
if (c != null && c.getType() == org.bukkit.Material.CHEST) { Location d3 = new Location(w, px, py, pz + 1); // 南
// 双块都设 LEFT + facing 对齐 + update 强制落盘 Location d4 = new Location(w, px, py, pz - 1); // 北
org.bukkit.block.data.type.Chest bd = Location[] dirs = new Location[]{d1, d2, d3, d4};
(org.bukkit.block.data.type.Chest) placed.getBlockData(); // ① 四向找已有木箱（东→西→南→北，命中第一个就接）
org.bukkit.block.data.type.Chest bdN = for (Location dl : dirs) {
(org.bukkit.block.data.type.Chest) c.getBlockData(); Block c = w.getBlockAt(dl);
bd.setType(Chest.Type.LEFT); if (c != null && c.getType() == org.bukkit.Material.CHEST) {
bd.setFacing(bdN.getFacing()); org.bukkit.block.data.type.Chest bd =
placed.setBlockData(bd); (org.bukkit.block.data.type.Chest) placed.getBlockData();
bdN.setType(Chest.Type.LEFT); org.bukkit.block.data.type.Chest bdN =
c.setBlockData(bdN); (org.bukkit.block.data.type.Chest) c.getBlockData();
// ★ 关键：update(true,false) 强制把连接态写回世界 bd.setType(Chest.Type.LEFT);
placed.getState().update(true, false); bd.setFacing(bdN.getFacing());
c.getState().update(true, false); placed.setBlockData(bd);
connected = true; bdN.setType(Chest.Type.LEFT);
twinBlock = c; c.setBlockData(bdN);
break; placed.getState().update(true, false);
} c.getState().update(true, false);
connected = true;
twinBlock = c;
break;
} }
if (connected) break;
} }
// ② 四向找空气位放第二个 CHEST（同样顺序，命中第一个就放）
if (!connected) { if (!connected) {
// 四向无木箱 → 找一个空气位放第二个 CHEST 接双箱 for (Location dl : dirs) {
int[][] offsets = {{1, 0}, {-1, 0}, {0, 1}, {0, -1}}; Block air = w.getBlockAt(dl);
for (int[] off : offsets) {
Location airLoc = new Location(w, px + off[0], py, pz + off[1]);
Block air = w.getBlockAt(airLoc);
if (air.getType() == org.bukkit.Material.AIR) { if (air.getType() == org.bukkit.Material.AIR) {
air.setType(org.bukkit.Material.CHEST, false); air.setType(org.bukkit.Material.CHEST, false);
org.bukkit.block.data.type.Chest bd2 = org.bukkit.block.data.type.Chest bd2 =
@@ -505,7 +504,6 @@ public class ChestCarryManager implements Listener {
air.setBlockData(bd2); air.setBlockData(bd2);
bd1.setType(Chest.Type.LEFT); bd1.setType(Chest.Type.LEFT);
placed.setBlockData(bd1); placed.setBlockData(bd1);
// ★ 关键：update(true,false) 强制落盘连接
placed.getState().update(true, false); placed.getState().update(true, false);
air.getState().update(true, false); air.getState().update(true, false);
connected = true; connected = true;
@@ -514,6 +512,7 @@ public class ChestCarryManager implements Listener {
} }
} }
} }
// ③ 全被占 → 回退 27 格单箱（塞满 27 + 剩余掉箱子旁，零丢失）
plugin.getLogger().info("[箱子搬运][诊断] 接双箱结果 connected=" plugin.getLogger().info("[箱子搬运][诊断] 接双箱结果 connected="
+ connected + " twin=" + (twinBlock != null + connected + " twin=" + (twinBlock != null
? twinBlock.getX()+","+twinBlock.getY()+","+twinBlock.getZ() : "无") ? twinBlock.getX()+","+twinBlock.getY()+","+twinBlock.getZ() : "无")
@@ -684,6 +683,18 @@ public class ChestCarryManager implements Listener {
try { try {
if (bl != null && bl.getType() != org.bukkit.Material.AIR) { if (bl != null && bl.getType() != org.bukkit.Material.AIR) {
bl.setType(org.bukkit.Material.AIR, false); bl.setType(org.bukkit.Material.AIR, false);
// ★ 33批十一次：清后 2 tick 再清一次（防双箱连接态回弹，孤半不再越积越多）
int bx = bl.getX(), by = bl.getY(), bz = bl.getZ();
org.bukkit.World bw = bl.getWorld();
plugin.getServer().getScheduler().runTaskLater(plugin, () -> {
try {
Block re = bw.getBlockAt(bx, by, bz);
if (re.getType() != org.bukkit.Material.AIR) {
re.setType(org.bukkit.Material.AIR, false);
}
} catch (Throwable ignored) {
}
}, 2L);
} }
} catch (Throwable ex) { } catch (Throwable ex) {
plugin.getLogger().fine("[箱子搬运] 清箱子方块失败: " + ex.getMessage()); plugin.getLogger().fine("[箱子搬运] 清箱子方块失败: " + ex.getMessage());