Fixup LightningBolt diff

Author: jpenilla

paper-server/patches/sources/net/minecraft/world/entity/LightningBolt.java.patch

@@ -48,47 +48,32 @@
                  List<Entity> entities = this.level()
                      .getEntities(
                          this,
-@@ -167,34 +_,47 @@
+@@ -167,34 +_,43 @@
      }
 
      private void spawnFire(int extraIgnitions) {
 -        if (!this.visualOnly && this.level() instanceof ServerLevel serverLevel) {
-+        if (!this.visualOnly && !this.isEffect && this.level() instanceof ServerLevel serverLevel) { // Paper - prevent any fire if only effect
++        if (!this.visualOnly && !this.isEffect && this.level() instanceof ServerLevel serverLevel && serverLevel.getGameRules().get(net.minecraft.world.level.gamerules.GameRules.FIRE_DAMAGE)) { // Paper - prevent any fire if only effect
              BlockPos var7 = this.blockPosition();
              if (serverLevel.canSpreadFireAround(var7)) {
--                BlockState state = BaseFireBlock.getState(serverLevel, var7);
--                if (serverLevel.getBlockState(var7).isAir() && state.canSurvive(serverLevel, var7)) {
--                    serverLevel.setBlockAndUpdate(var7, state);
--                    this.blocksSetOnFire++;
--                }
--
--                for (int i = 0; i < extraIgnitions; i++) {
--                    BlockPos blockPos1 = var7.offset(this.random.nextInt(3) - 1, this.random.nextInt(3) - 1, this.random.nextInt(3) - 1);
--                    state = BaseFireBlock.getState(serverLevel, blockPos1);
--                    if (serverLevel.getBlockState(blockPos1).isAir() && state.canSurvive(serverLevel, blockPos1)) {
--                        serverLevel.setBlockAndUpdate(blockPos1, state);
-+                // CraftBukkit start
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.level(), var7, this).isCancelled()) {
-+                    BlockState state = BaseFireBlock.getState(serverLevel, var7);
-+                    if (serverLevel.getBlockState(var7).isAir() && state.canSurvive(serverLevel, var7)) {
-+                        serverLevel.setBlockAndUpdate(var7, state);
+                 BlockState state = BaseFireBlock.getState(serverLevel, var7);
+                 if (serverLevel.getBlockState(var7).isAir() && state.canSurvive(serverLevel, var7)) {
++                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.level(), var7, this).isCancelled()) { // CraftBukkit
+                     serverLevel.setBlockAndUpdate(var7, state);
+                     this.blocksSetOnFire++;
++                    } // CraftBukkit
+                 }
+ 
+                 for (int i = 0; i < extraIgnitions; i++) {
+                     BlockPos blockPos1 = var7.offset(this.random.nextInt(3) - 1, this.random.nextInt(3) - 1, this.random.nextInt(3) - 1);
+                     state = BaseFireBlock.getState(serverLevel, blockPos1);
+                     if (serverLevel.getBlockState(blockPos1).isAir() && state.canSurvive(serverLevel, blockPos1)) {
++                        if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.level(), blockPos1, this).isCancelled()) { // CraftBukkit
+                         serverLevel.setBlockAndUpdate(blockPos1, state);
                          this.blocksSetOnFire++;
++                        } // CraftBukkit
                      }
-+
-+                    for (int i = 0; i < extraIgnitions; i++) {
-+                        BlockPos blockPos1 = var7.offset(this.random.nextInt(3) - 1, this.random.nextInt(3) - 1, this.random.nextInt(3) - 1);
-+                        state = BaseFireBlock.getState(serverLevel, blockPos1);
-+                        if (serverLevel.getBlockState(blockPos1).isAir() && state.canSurvive(serverLevel, blockPos1)) {
-+                            // CraftBukkit start
-+                            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.level(), blockPos1, this).isCancelled()) {
-+                                serverLevel.setBlockAndUpdate(blockPos1, state);
-+                                this.blocksSetOnFire++;
-+                            }
-+                            // CraftBukkit end
-+                        }
-+                    }
                  }
-+                // CraftBukkit end
              }
          }
      }