fly6516/SimpleTombstone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tombstone): 优化墓碑生成和删除逻辑

Browse Source 
-优化墓碑生成位置，确保在液体上方生成玻璃块
- 添加删除墓碑下方玻璃块的逻辑
- 重构 PlayerTombstoneData 类为 record 类
This commit is contained in:
fly6516 2025-03-24 16:44:42 +08:00
parent c1a7c1c62d
commit c54688ee0f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/simpletombstone/SimpleTombstone.java
View File

@ -65,12 +65,18 @@ public class SimpleTombstone implements ModInitializer {
while (world.isAir(deathPos.down())) { while (world.isAir(deathPos.down())) {
deathPos = 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()); world.setBlockState(deathPos, Blocks.GLASS.getDefaultState());
} }
BlockPos tombstonePos = deathPos.up(); BlockPos tombstonePos = deathPos.up();
List<ItemStack> items = new ArrayList<>(); List<ItemStack> items = new ArrayList<>();
for (int i = 0; i < player.getInventory().size(); i++) { 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 playerPos.getX() + 4, playerPos.getY() + 4, playerPos.getZ() + 4
)) { )) {
PlayerTombstoneData data = TOMBSTONE_CHESTS.get(pos); 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(); Block block = world.getBlockState(pos).getBlock();
if (block instanceof FlowerPotBlock) { if (block instanceof FlowerPotBlock) {
LOGGER.info("[SimpleTombstone] 玩家 {} 靠近墓碑，恢复物品。", player.getName().getString()); LOGGER.info("[SimpleTombstone] 玩家 {} 靠近墓碑，恢复物品。", player.getName().getString());
for (ItemStack stack : data.getItems()) { for (ItemStack stack : data.items()) {
player.getInventory().offerOrDrop(stack); player.getInventory().offerOrDrop(stack);
} }
if (world.getBlockState(pos.down()).getBlock() == Blocks.GLASS) {
world.removeBlock(pos.down(), false);
LOGGER.info("[SimpleTombstone] 删除墓碑的玻璃块。");
}
world.removeBlock(pos, false); world.removeBlock(pos, false);
TOMBSTONE_CHESTS.remove(pos); TOMBSTONE_CHESTS.remove(pos);
RESURRECTED_PLAYERS.remove(player.getUuid()); RESURRECTED_PLAYERS.remove(player.getUuid());
@ -121,16 +131,6 @@ public class SimpleTombstone implements ModInitializer {
} }
} }
private static class PlayerTombstoneData { private record PlayerTombstoneData(UUID playerId, List<ItemStack> items) {
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; }
} }
} }