mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
e035fd7034
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: cc9aa21a SPIGOT-6399, SPIGOT-7344: Clarify collidable behavior for player entities f23325b6 Add API for per-world simulation distances 26e1774e Add API for per-world view distances 0b541e60 Add PlayerLoginEvent#getRealAddress 5f027d2d PR-949: Add Vector#fromJOML() overloads for read-only vector types CraftBukkit Changes: bcf56171a PR-1321: Clean up some stuff which got missed during previous PRs 7f833a2d1 SPIGOT-7462: Players no longer drop XP after dying near a Sculk Catalyst 752aac669 Implement APIs for per world view and simulation distances 57d7ef433 Preserve empty enchantment tags for glow effect 465ec3fb4 Remove connected check on setScoreboard f90ce621e Use one PermissibleBase for all command blocks 5876cca44 SPIGOT-7550: Fix creation of Arrow instances f03fc3aa3 SPIGOT-7549: ServerTickManager#setTickRate incorrect Precondition 9d7f49b01 SPIGOT-7548: Fix wrong spawn location for experience orb and dropped item Spigot Changes: ed9ba9a4 Drop no longer required patch ignoring -o option 86b5dd6a SPIGOT-7546: Fix hardcoded check for outdated client message aa7cde7a Remove obsolete APIs for per world view and simulation distances 6dff577e Remove obsolete patch preserving empty `ench` tags a3bf95b8 Remove obsolete PlayerLoginEvent#getRealAddress 1b02f5d6 Remove obsolete connected check on setScoreboard patch acf717eb Remove obsolete command block PermissibleBase patch 053fa2a9 Remove redundant patch dealing with null tile entities
100 lines
5.5 KiB
Diff
100 lines
5.5 KiB
Diff
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
|
|
index 255fb5e922c63130708e4bcab208b4db52a58387..1e76230c078ef07418345b0bc50c574cf63c9094 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 c394e12e73680761d22612c5eec4bac9dd8893e3..e652368f56a3e1f90d0162277d025f696c560ed2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -773,7 +773,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();
|
|
}
|
|
@@ -2433,7 +2433,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();
|
|
}
|
|
@@ -2443,8 +2442,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
|
|
}
|
|
};
|
|
|