Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-24 15:20:11 +01:00
45 Zeilen
2.1 KiB
Diff
45 Zeilen
2.1 KiB
Diff
|
--- a/net/minecraft/server/BlockFireAbstract.java
|
||
|
+++ b/net/minecraft/server/BlockFireAbstract.java
|
||
|
@@ -41,7 +41,14 @@
|
||
|
if (!entity.isFireProof()) {
|
||
|
entity.setFireTicks(entity.getFireTicks() + 1);
|
||
|
if (entity.getFireTicks() == 0) {
|
||
|
- entity.setOnFire(8);
|
||
|
+ // CraftBukkit start
|
||
|
+ org.bukkit.event.entity.EntityCombustEvent event = new org.bukkit.event.entity.EntityCombustByBlockEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition), entity.getBukkitEntity(), 8);
|
||
|
+ world.getServer().getPluginManager().callEvent(event);
|
||
|
+
|
||
|
+ if (!event.isCancelled()) {
|
||
|
+ entity.setOnFire(event.getDuration(), false);
|
||
|
+ }
|
||
|
+ // CraftBukkit end
|
||
|
}
|
||
|
|
||
|
entity.damageEntity(DamageSource.FIRE, this.g);
|
||
|
@@ -53,9 +60,10 @@
|
||
|
@Override
|
||
|
public void onPlace(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1, boolean flag) {
|
||
|
if (!iblockdata1.a(iblockdata.getBlock())) {
|
||
|
- if (world.getDimensionKey() != World.OVERWORLD && world.getDimensionKey() != World.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) {
|
||
|
+ // CraftBukkit - getTypeKey()
|
||
|
+ if (world.getTypeKey()!= DimensionManager.OVERWORLD && world.getTypeKey()!= DimensionManager.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) {
|
||
|
if (!iblockdata.canPlace(world, blockposition)) {
|
||
|
- world.a(blockposition, false);
|
||
|
+ fireExtinguished(world, blockposition); // CraftBukkit - fuel block broke
|
||
|
}
|
||
|
|
||
|
}
|
||
|
@@ -92,4 +100,12 @@
|
||
|
|
||
|
return true;
|
||
|
}
|
||
|
+
|
||
|
+ // CraftBukkit start
|
||
|
+ protected void fireExtinguished(GeneratorAccess world, BlockPosition position) {
|
||
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, position, Blocks.AIR.getBlockData()).isCancelled()) {
|
||
|
+ world.a(position, false);
|
||
|
+ }
|
||
|
+ }
|
||
|
+ // CraftBukkit end
|
||
|
}
|