1 files changed, 100 insertions, 0 deletions
diff --git a/patches/server/1047-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1047-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
new file mode 100644
index 0000000000..ec6b50fe71
--- /dev/null
+++ b/patches/server/1047-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
@@ -0,0 +1,100 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tamion <[email protected]>
+Date: Sat, 30 Sep 2023 12:36:14 +0200
+Subject: [PATCH] Fix strikeLightningEffect powers lightning rods and clears
+ copper
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java
+index 471275c5362b61ce8b5b9dd5c85b3e93cabd3f76..841ee02f6ad19d737534a2bf9f52d0d09785660f 100644
+--- a/src/main/java/net/minecraft/world/entity/LightningBolt.java
++++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java
+@@ -45,7 +45,7 @@ public class LightningBolt extends Entity {
+     private ServerPlayer cause;
+     private final Set<Entity> hitEntities = Sets.newHashSet();
+     private int blocksSetOnFire;
+-    public boolean isSilent = false; // Spigot
++    public boolean isEffect; // Paper
+ 
+     public LightningBolt(EntityType<? extends LightningBolt> type, Level world) {
+         super(type, world);
+@@ -86,7 +86,7 @@ public class LightningBolt extends Entity {
+     @Override
+     public void tick() {
+         super.tick();
+-        if (!this.isSilent && this.life == 2) { // Spigot
++        if (!this.isEffect && this.life == 2) { // Spigot // Paper
+             if (this.level().isClientSide()) {
+                 this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.LIGHTNING_BOLT_THUNDER, SoundSource.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F, false);
+                 this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.LIGHTNING_BOLT_IMPACT, SoundSource.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F, false);
+@@ -133,7 +133,7 @@ public class LightningBolt extends Entity {
+             }
+         }
+ 
+-        if (this.life >= 0 && !this.visualOnly) { // CraftBukkit - add !this.visualOnly
++        if (this.life >= 0 && !this.isEffect) { // CraftBukkit - add !this.visualOnly // Paper - undo
+             if (!(this.level() instanceof ServerLevel)) {
+                 this.level().setSkyFlashTime(2);
+             } else if (!this.visualOnly) {
+@@ -162,7 +162,7 @@ public class LightningBolt extends Entity {
+     }
+ 
+     private void spawnFire(int spreadAttempts) {
+-        if (!this.visualOnly && !this.level().isClientSide && this.level().getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
++        if (!this.visualOnly && !this.isEffect && !this.level().isClientSide && this.level().getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) { // Paper
+             BlockPos blockposition = this.blockPosition();
+             BlockState iblockdata = BaseFireBlock.getState(this.level(), blockposition);
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 746f88db6b78b3c8ec372bfaacb26ec98f3b1163..c3060d1d4d0caf369c6ab516cb424f45eb851019 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -771,7 +771,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+ 
+         LightningBolt lightning = EntityType.LIGHTNING_BOLT.create(this.world);
+         lightning.moveTo(loc.getX(), loc.getY(), loc.getZ());
+-        lightning.setVisualOnly(isVisual);
++        lightning.isEffect = isVisual; // Paper
+         this.world.strikeLightning(lightning, LightningStrikeEvent.Cause.CUSTOM);
+         return (LightningStrike) lightning.getBukkitEntity();
+     }
+@@ -2403,7 +2403,6 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+         {
+             LightningBolt lightning = EntityType.LIGHTNING_BOLT.create( CraftWorld.this.world );
+             lightning.moveTo( loc.getX(), loc.getY(), loc.getZ() );
+-            lightning.isSilent = isSilent;
+             CraftWorld.this.world.strikeLightning( lightning, LightningStrikeEvent.Cause.CUSTOM );
+             return (LightningStrike) lightning.getBukkitEntity();
+         }
+@@ -2413,8 +2412,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+         {
+             LightningBolt lightning = EntityType.LIGHTNING_BOLT.create( CraftWorld.this.world );
+             lightning.moveTo( loc.getX(), loc.getY(), loc.getZ() );
+-            lightning.visualOnly = true;
+-            lightning.isSilent = isSilent;
++            lightning.isEffect = true; // Paper
+             CraftWorld.this.world.strikeLightning( lightning, LightningStrikeEvent.Cause.CUSTOM );
+             return (LightningStrike) lightning.getBukkitEntity();
+         }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+index cd9bd7f06e55e970b7791e635610bb5e7491d102..70b377c03346cb8573827aeb493f3b6eb8efb1f8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+@@ -13,7 +13,7 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
+ 
+     @Override
+     public boolean isEffect() {
+-        return this.getHandle().visualOnly;
++        return this.getHandle().isEffect; // Paper
+     }
+ 
+     public int getFlashes() {
+@@ -57,7 +57,7 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
+         @Override
+         public boolean isSilent()
+         {
+-            return CraftLightningStrike.this.getHandle().isSilent;
++            return false; // Paper - the concept of isSilent doesn't exist as sound is controlled by the client
+         }
+     };
+