3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-29 09:30:07 +01:00
Paper/nms-patches/BlockBed.patch

52 Zeilen
2.4 KiB
Diff

--- a/net/minecraft/server/BlockBed.java
+++ b/net/minecraft/server/BlockBed.java
2019-04-25 04:00:00 +02:00
@@ -42,20 +42,37 @@
}
}
- 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-04-23 04:00:00 +02:00
entityhuman.a((IChatBaseComponent) (new ChatMessage("block.minecraft.bed.occupied", new Object[0])), true);
return true;
} 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) -> {
if (entityhuman_enumbedresult != null) {
entityhuman.a(entityhuman_enumbedresult.a(), true);
}
+ // CraftBukkit start - handling bed explosion from below here
+ else if (entityhuman_enumbedresult == EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE) {
+ this.explodeBed(finaliblockdata, world, finalblockposition);
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
});
return true;
}
+ // CraftBukkit start - moved bed explosion into separate method
} else {
+ return true;
+ }
+ }
+ }
+
+ private boolean 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-04-25 04:00:00 +02:00
@@ -65,8 +82,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);
return true;
- }
- }
+ // CraftBukkit end
}
2019-04-23 04:00:00 +02:00
@Override