From c54688ee0f5139cf7a9d0824811d2642a43ee964 Mon Sep 17 00:00:00 2001
From: fly6516 <fly6516@outlook.com>
Date: Mon, 24 Mar 2025 16:44:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(tombstone):=20=E4=BC=98=E5=8C=96=E5=A2=93?=
 =?UTF-8?q?=E7=A2=91=E7=94=9F=E6=88=90=E5=92=8C=E5=88=A0=E9=99=A4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-优化墓碑生成位置，确保在液体上方生成玻璃块
- 添加删除墓碑下方玻璃块的逻辑
- 重构 PlayerTombstoneData 类为 record 类
---
 .../com/simpletombstone/SimpleTombstone.java  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/simpletombstone/SimpleTombstone.java b/src/main/java/com/simpletombstone/SimpleTombstone.java
index 6cee055..09f4013 100644
--- a/src/main/java/com/simpletombstone/SimpleTombstone.java
+++ b/src/main/java/com/simpletombstone/SimpleTombstone.java
@@ -65,12 +65,18 @@ public class SimpleTombstone implements ModInitializer {
         while (world.isAir(deathPos.down())) {
             deathPos = deathPos.down();
         }
+        deathPos = deathPos.down();
 
-        if (!world.getBlockState(deathPos).isSolid()) {
-            LOGGER.warn("[SimpleTombstone] 位置 {} 处为液体，替换为玻璃。", deathPos.toShortString());
+        // 只有下方是液体时才生成玻璃
+        if (world.getBlockState(deathPos.down()).getBlock() instanceof FluidBlock) {
+            LOGGER.warn("[SimpleTombstone] 位置 {} 处下方为液体，替换为玻璃。", deathPos.toShortString());
+            world.setBlockState(deathPos, Blocks.GLASS.getDefaultState());
+        } else if (!world.getBlockState(deathPos).isFullCube(world, deathPos)) {
+            LOGGER.warn("[SimpleTombstone] 位置 {} 处非实体块，替换为玻璃。", deathPos.toShortString());
             world.setBlockState(deathPos, Blocks.GLASS.getDefaultState());
         }
 
+
         BlockPos tombstonePos = deathPos.up();
         List<ItemStack> items = new ArrayList<>();
         for (int i = 0; i < player.getInventory().size(); i++) {
@@ -104,13 +110,17 @@ public class SimpleTombstone implements ModInitializer {
                 playerPos.getX() + 4, playerPos.getY() + 4, playerPos.getZ() + 4
         )) {
             PlayerTombstoneData data = TOMBSTONE_CHESTS.get(pos);
-            if (data != null && data.getPlayerId().equals(player.getUuid())) {
+            if (data != null && data.playerId().equals(player.getUuid())) {
                 Block block = world.getBlockState(pos).getBlock();
                 if (block instanceof FlowerPotBlock) {
                     LOGGER.info("[SimpleTombstone] 玩家 {} 靠近墓碑，恢复物品。", player.getName().getString());
-                    for (ItemStack stack : data.getItems()) {
+                    for (ItemStack stack : data.items()) {
                         player.getInventory().offerOrDrop(stack);
                     }
+                    if (world.getBlockState(pos.down()).getBlock() == Blocks.GLASS) {
+                        world.removeBlock(pos.down(), false);
+                        LOGGER.info("[SimpleTombstone] 删除墓碑的玻璃块。");
+                    }
                     world.removeBlock(pos, false);
                     TOMBSTONE_CHESTS.remove(pos);
                     RESURRECTED_PLAYERS.remove(player.getUuid());
@@ -121,16 +131,6 @@ public class SimpleTombstone implements ModInitializer {
         }
     }
 
-    private static class PlayerTombstoneData {
-        private final UUID playerId;
-        private final List<ItemStack> items;
-
-        public PlayerTombstoneData(UUID playerId, List<ItemStack> items) {
-            this.playerId = playerId;
-            this.items = items;
-        }
-
-        public UUID getPlayerId() { return playerId; }
-        public List<ItemStack> getItems() { return items; }
+    private record PlayerTombstoneData(UUID playerId, List<ItemStack> items) {
     }
 }