Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>

paper-server/nms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/BlockFireAbstract.java
 +++ b/net/minecraft/world/level/block/BlockFireAbstract.java
-@@ -19,6 +19,10 @@
+@@ -20,6 +20,10 @@
  import net.minecraft.world.phys.shapes.VoxelShape;
  import net.minecraft.world.phys.shapes.VoxelShapeCollision;
  
@@ -11,10 +11,10 @@
  public abstract class BlockFireAbstract extends Block {
  
      private static final int SECONDS_ON_FIRE = 8;
-@@ -127,7 +131,14 @@
-         if (!entity.fireImmune()) {
-             entity.setRemainingFireTicks(entity.getRemainingFireTicks() + 1);
-             if (entity.getRemainingFireTicks() == 0) {
+@@ -137,7 +141,14 @@
+             }
+ 
+             if (entity.getRemainingFireTicks() >= 0) {
 -                entity.igniteForSeconds(8.0F);
 +                // 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.0F);
@@ -27,7 +27,7 @@
              }
          }
  
-@@ -136,26 +147,26 @@
+@@ -146,26 +157,26 @@
      }
  
      @Override
@@ -38,8 +38,8 @@
                  Optional<BlockPortalShape> optional = BlockPortalShape.findEmptyPortalShape(world, blockposition, EnumDirection.EnumAxis.X);
  
                  if (optional.isPresent()) {
--                    ((BlockPortalShape) optional.get()).createPortalBlocks();
-+                    ((BlockPortalShape) optional.get()).createPortalBlocks((context == null) ? null : context.getPlayer()); // CraftBukkit - player
+-                    ((BlockPortalShape) optional.get()).createPortalBlocks(world);
++                    ((BlockPortalShape) optional.get()).createPortalBlocks(world, (context == null) ? null : context.getPlayer()); // CraftBukkit - player
                      return;
                  }
              }
@@ -58,7 +58,7 @@
      }
  
      @Override
-@@ -203,4 +214,12 @@
+@@ -213,4 +224,12 @@
              }
          }
      }