2023-11-11 21:09:14 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Tamion <70228790+notTamion@users.noreply.github.com>
|
|
|
|
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
|
2024-04-25 00:36:49 +02:00
|
|
|
index 0471d9c85af02133f99cca4e181b83b58a3f1abc..4f701788bd21b61cad251a3a88f9bc416fb99051 100644
|
2023-11-11 21:09:14 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LightningBolt.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java
|
2024-04-25 00:36:49 +02:00
|
|
|
@@ -47,6 +47,7 @@ public class LightningBolt extends Entity {
|
2023-11-11 21:09:14 +01:00
|
|
|
private ServerPlayer cause;
|
|
|
|
private final Set<Entity> hitEntities = Sets.newHashSet();
|
|
|
|
private int blocksSetOnFire;
|
2024-01-13 18:34:33 +01:00
|
|
|
+ public boolean isEffect; // Paper - Properly handle lightning effects api
|
2023-11-11 21:09:14 +01:00
|
|
|
|
|
|
|
public LightningBolt(EntityType<? extends LightningBolt> type, Level world) {
|
|
|
|
super(type, world);
|
2024-04-25 00:36:49 +02:00
|
|
|
@@ -87,7 +88,7 @@ public class LightningBolt extends Entity {
|
2023-11-11 21:09:14 +01:00
|
|
|
@Override
|
|
|
|
public void tick() {
|
|
|
|
super.tick();
|
2024-01-14 10:46:04 +01:00
|
|
|
- if (this.life == 2) {
|
|
|
|
+ if (!this.isEffect && this.life == 2) { // Paper - Properly handle lightning effects api
|
2023-11-11 21:09:14 +01:00
|
|
|
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);
|
2024-04-25 00:36:49 +02:00
|
|
|
@@ -134,7 +135,7 @@ public class LightningBolt extends Entity {
|
2023-11-11 21:09:14 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (this.life >= 0 && !this.visualOnly) { // CraftBukkit - add !this.visualOnly
|
2024-01-13 18:34:33 +01:00
|
|
|
+ if (this.life >= 0 && !this.isEffect) { // CraftBukkit - add !this.visualOnly // Paper - Properly handle lightning effects api
|
2023-11-11 21:09:14 +01:00
|
|
|
if (!(this.level() instanceof ServerLevel)) {
|
|
|
|
this.level().setSkyFlashTime(2);
|
|
|
|
} else if (!this.visualOnly) {
|
2024-04-25 00:36:49 +02:00
|
|
|
@@ -163,7 +164,7 @@ public class LightningBolt extends Entity {
|
2023-11-11 21:09:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
private void spawnFire(int spreadAttempts) {
|
|
|
|
- if (!this.visualOnly && !this.level().isClientSide && this.level().getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) {
|
2024-01-13 18:34:33 +01:00
|
|
|
+ if (!this.visualOnly && !this.isEffect && !this.level().isClientSide && this.level().getGameRules().getBoolean(GameRules.RULE_DOFIRETICK)) { // Paper - Properly handle lightning effects api
|
2023-11-11 21:09:14 +01:00
|
|
|
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
|
2024-06-14 14:11:52 +02:00
|
|
|
index ee3e8e3b766f7cc363001fb44ae1eb98679cbcc9..c1642dd60531494d173ac08aa90791143f5bd99a 100644
|
2023-11-11 21:09:14 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2024-06-14 14:11:52 +02:00
|
|
|
@@ -749,7 +749,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2023-11-11 21:09:14 +01:00
|
|
|
|
|
|
|
LightningBolt lightning = EntityType.LIGHTNING_BOLT.create(this.world);
|
|
|
|
lightning.moveTo(loc.getX(), loc.getY(), loc.getZ());
|
|
|
|
- lightning.setVisualOnly(isVisual);
|
2024-01-13 18:34:33 +01:00
|
|
|
+ lightning.isEffect = isVisual; // Paper - Properly handle lightning effects api
|
2023-11-11 21:09:14 +01:00
|
|
|
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
|
2024-01-14 10:46:04 +01:00
|
|
|
index 6fed8075aa75e3852dc826a45ca44603c0446a56..e9f471e60af0725ec34e2985d63ae9ea9f88590a 100644
|
2023-11-11 21:09:14 +01:00
|
|
|
--- 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;
|
2024-01-13 18:34:33 +01:00
|
|
|
+ return this.getHandle().isEffect; // Paper - Properly handle lightning effects api
|
2023-11-11 21:09:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public int getFlashes() {
|