Paper/nms-patches/BlockBed.patch

55 lines
2.6 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/BlockBed.java
+++ b/net/minecraft/server/BlockBed.java
2019-12-10 23:00:00 +01:00
@@ -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) {
2018-12-06 00:00:00 +01:00
if ((Boolean) iblockdata.get(BlockBed.OCCUPIED)) {
2019-12-10 23:00:00 +01:00
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;
2019-04-23 04:00:00 +02:00
} else {
+ // CraftBukkit start
+ IBlockData finaliblockdata = iblockdata;
+ BlockPosition finalblockposition = blockposition;
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
entityhuman.sleep(blockposition).ifLeft((entityhuman_enumbedresult) -> {
+ // CraftBukkit start - handling bed explosion from below here
+ if (entityhuman_enumbedresult == EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE) {
2019-04-23 04:00:00 +02:00
+ this.explodeBed(finaliblockdata, world, finalblockposition);
+ } else
2019-04-23 04:00:00 +02:00
+ // CraftBukkit end
if (entityhuman_enumbedresult != null) {
entityhuman.a(entityhuman_enumbedresult.a(), true);
}
2019-12-10 23:00:00 +01:00
@@ -59,7 +69,14 @@
2019-04-23 04:00:00 +02:00
});
2019-12-10 23:00:00 +01:00
return EnumInteractionResult.SUCCESS;
}
+ // CraftBukkit start - moved bed explosion into separate method
} else {
2019-12-10 23:00:00 +01:00
+ return EnumInteractionResult.SUCCESS;
+ }
+ }
+ }
+
2019-12-10 23:00:00 +01:00
+ private EnumInteractionResult explodeBed(IBlockData iblockdata, World world, BlockPosition blockposition) {
2019-04-23 04:00:00 +02:00
world.a(blockposition, false);
BlockPosition blockposition1 = blockposition.shift(((EnumDirection) iblockdata.get(BlockBed.FACING)).opposite());
2019-12-10 23:00:00 +01:00
@@ -69,8 +86,7 @@
2019-04-23 04:00:00 +02:00
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);
2019-12-10 23:00:00 +01:00
return EnumInteractionResult.SUCCESS;
- }
- }
+ // CraftBukkit end
}
2019-12-10 23:00:00 +01:00
private boolean a(World world, BlockPosition blockposition) {