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-10-24 12:11:32 +02:00
|
|
|
index 152ecd38814089333b8d61538297ce720756d2c3..12127b14babf646711d3a118416453c4f1ac1460 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-10-24 12:11:32 +02:00
|
|
|
@@ -48,6 +48,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-10-24 12:11:32 +02:00
|
|
|
@@ -86,7 +87,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-10-24 12:11:32 +02:00
|
|
|
@@ -133,7 +134,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-10-24 12:11:32 +02:00
|
|
|
@@ -162,7 +163,7 @@ public class LightningBolt extends Entity {
|
2023-11-11 21:09:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void spawnFire(int spreadAttempts) {
|
2024-10-24 12:11:32 +02:00
|
|
|
- if (!this.visualOnly) {
|
|
|
|
|
+ if (!this.visualOnly && !this.isEffect) { // Paper - Properly handle lightning effects api
|
|
|
|
|
Level world = this.level();
|
2023-11-11 21:09:14 +01:00
|
|
|
|
2024-10-24 12:11:32 +02:00
|
|
|
if (world instanceof ServerLevel) {
|
2023-11-11 21:09:14 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index d72ce4b4cd5bec76eb45d6f0027643740f9907fd..b5b21852b4c3dc15e548afd81bdefbb83b9e7e9c 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
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
@@ -722,7 +722,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2023-11-11 21:09:14 +01:00
|
|
|
|
2024-10-24 12:11:32 +02:00
|
|
|
LightningBolt lightning = EntityType.LIGHTNING_BOLT.create(this.world, EntitySpawnReason.COMMAND);
|
2023-11-11 21:09:14 +01:00
|
|
|
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() {
|
