mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 05:54:43 +01:00
54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
--- a/net/minecraft/server/BlockBed.java
|
|
+++ b/net/minecraft/server/BlockBed.java
|
|
@@ -43,7 +43,8 @@
|
|
}
|
|
}
|
|
|
|
- if (world.worldProvider.canRespawn() && world.getBiome(blockposition) != Biomes.NETHER) {
|
|
+ // CraftBukkit - moved world and biome check into EntityHuman
|
|
+ if (true || world.worldProvider.canRespawn() && world.getBiome(blockposition) != Biomes.NETHER) {
|
|
if ((Boolean) iblockdata.get(BlockBed.OCCUPIED)) {
|
|
if (!this.a(world, blockposition)) {
|
|
entityhuman.a((IChatBaseComponent) (new ChatMessage("block.minecraft.bed.occupied", new Object[0])), true);
|
|
@@ -51,7 +52,16 @@
|
|
|
|
return EnumInteractionResult.SUCCESS;
|
|
} else {
|
|
+ // CraftBukkit start
|
|
+ IBlockData finaliblockdata = iblockdata;
|
|
+ BlockPosition finalblockposition = blockposition;
|
|
+ // CraftBukkit end
|
|
entityhuman.sleep(blockposition).ifLeft((entityhuman_enumbedresult) -> {
|
|
+ // CraftBukkit start - handling bed explosion from below here
|
|
+ if (entityhuman_enumbedresult == EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE) {
|
|
+ this.explodeBed(finaliblockdata, world, finalblockposition);
|
|
+ } else
|
|
+ // CraftBukkit end
|
|
if (entityhuman_enumbedresult != null) {
|
|
entityhuman.a(entityhuman_enumbedresult.a(), true);
|
|
}
|
|
@@ -59,7 +69,14 @@
|
|
});
|
|
return EnumInteractionResult.SUCCESS;
|
|
}
|
|
+ // CraftBukkit start - moved bed explosion into separate method
|
|
} else {
|
|
+ return EnumInteractionResult.SUCCESS;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private EnumInteractionResult explodeBed(IBlockData iblockdata, World world, BlockPosition blockposition) {
|
|
world.a(blockposition, false);
|
|
BlockPosition blockposition1 = blockposition.shift(((EnumDirection) iblockdata.get(BlockBed.FACING)).opposite());
|
|
|
|
@@ -69,8 +86,7 @@
|
|
|
|
world.createExplosion((Entity) null, DamageSource.a(), (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, 5.0F, true, Explosion.Effect.DESTROY);
|
|
return EnumInteractionResult.SUCCESS;
|
|
- }
|
|
- }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
private boolean a(World world, BlockPosition blockposition) {
|