craftbukkit/nms-patches/net/minecraft/world/level/block/BlockCampfire.patch

24 lines
1.3 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/level/block/BlockCampfire.java
+++ b/net/minecraft/world/level/block/BlockCampfire.java
2024-06-14 01:05:00 +10:00
@@ -105,7 +105,7 @@
@Override
2024-04-24 01:15:00 +10:00
protected void entityInside(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
2024-06-14 01:05:00 +10:00
if ((Boolean) iblockdata.getValue(BlockCampfire.LIT) && entity instanceof EntityLiving) {
- entity.hurt(world.damageSources().campfire(), (float) this.fireDamage);
+ entity.hurt(world.damageSources().campfire().directBlock(world, blockposition), (float) this.fireDamage); // CraftBukkit
}
2021-11-22 09:00:00 +11:00
super.entityInside(iblockdata, world, blockposition, entity);
2024-06-14 01:05:00 +10:00
@@ -215,6 +215,11 @@
2021-11-22 09:00:00 +11:00
BlockPosition blockposition = movingobjectpositionblock.getBlockPos();
2021-11-22 09:00:00 +11:00
if (!world.isClientSide && iprojectile.isOnFire() && iprojectile.mayInteract(world, blockposition) && !(Boolean) iblockdata.getValue(BlockCampfire.LIT) && !(Boolean) iblockdata.getValue(BlockCampfire.WATERLOGGED)) {
2021-06-11 15:00:00 +10:00
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition, iprojectile).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
2021-11-22 09:00:00 +11:00
world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockProperties.LIT, true), 11);
2020-06-25 10:00:00 +10:00
}
2021-06-11 15:00:00 +10:00