Repackage patches

By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
parent 2777f7b780
commit 18496e998f
433 changed files with 0 additions and 0 deletions
--- a/paper-server/nms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch
+++ b/paper-server/nms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch
@@ -0,0 +1,48 @@
+--- a/net/minecraft/server/BlockFireAbstract.java
+++ b/net/minecraft/server/BlockFireAbstract.java
+@@ -36,7 +36,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.b);
+@@ -58,14 +65,14 @@
+             }
+ 
+             if (!iblockdata.canPlace(world, blockposition)) {
+-                world.a(blockposition, false);
+                fireExtinguished(world, blockposition); // CraftBukkit - fuel block broke
+             }
+ 
+         }
+     }
+ 
+     private static boolean a(World world) {
+-        return world.getDimensionKey() == World.OVERWORLD || world.getDimensionKey() == World.THE_NETHER;
+        return world.getTypeKey() == DimensionManager.OVERWORLD || world.getTypeKey() == DimensionManager.THE_NETHER; // CraftBukkit - getTypeKey()
+     }
+ 
+     @Override
+@@ -109,4 +116,12 @@
+             }
+         }
+     }
+
+    // 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
+ }