Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
34 Zeilen
2.0 KiB
Diff
34 Zeilen
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 9 Apr 2023 21:11:58 -0700
|
|
Subject: [PATCH] Fix a couple of upstream bed issues
|
|
|
|
Upstream incorrectly skipped explosion logic if
|
|
the bed was occupied and added a "feature" where
|
|
if you set your spawn in a respawn anchor world
|
|
but then replaced it with a bed, you could respawn
|
|
at the bed in that world.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
|
|
index 872bec4c366c86177334452315cc4a8097dae3c0..e9f8949267208b93f0c56c36ada38274ed4280f5 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
|
|
@@ -108,6 +108,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
|
|
world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper - add exploded state
|
|
return InteractionResult.SUCCESS;
|
|
} else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
|
|
+ if (!BedBlock.canSetSpawn(world)) return this.explodeBed(state, world, pos); // Paper - check explode first
|
|
if (!this.kickVillagerOutOfBed(world, pos)) {
|
|
player.displayClientMessage(Component.translatable("block.minecraft.bed.occupied"), true);
|
|
}
|
|
@@ -165,8 +166,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
|
|
// CraftBukkit end
|
|
|
|
public static boolean canSetSpawn(Level world) {
|
|
- // CraftBukkit - moved world and biome check into EntityHuman
|
|
- return true || world.dimensionType().bedWorks();
|
|
+ return world.dimensionType().bedWorks(); // Paper - actually check if the bed works
|
|
}
|
|
|
|
private boolean kickVillagerOutOfBed(Level world, BlockPos pos) {
|