2020-05-06 09:44:47 +02:00
From 375dc89e8d706626d0409772f1dd7f6de2c63752 Mon Sep 17 00:00:00 2001
2018-09-14 17:49:25 +02:00
From: Trigary <trigary0@gmail.com>
Date: Fri, 14 Sep 2018 17:42:08 +0200
Subject: [PATCH] Limit lightning strike effect distance
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2020-05-02 00:03:47 +02:00
index 487b0d5cd6..b8789c8ecc 100644
2018-09-14 17:49:25 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2020-01-18 18:28:32 +01:00
@@ -242,6 +242,28 @@ public class PaperWorldConfig {
2018-09-14 17:49:25 +02:00
}
}
2019-12-12 17:20:43 +01:00
2018-11-23 08:23:50 +01:00
+ public double sqrMaxThunderDistance;
2018-09-14 17:49:25 +02:00
+ public double sqrMaxLightningImpactSoundDistance;
+ public double maxLightningFlashDistance;
+ private void lightningStrikeDistanceLimit() {
2018-11-23 08:23:50 +01:00
+ sqrMaxThunderDistance = getInt("lightning-strike-distance-limit.sound", -1);
+ if (sqrMaxThunderDistance > 0) {
+ sqrMaxThunderDistance *= sqrMaxThunderDistance;
2018-09-14 17:49:25 +02:00
+ }
+
+ sqrMaxLightningImpactSoundDistance = getInt("lightning-strike-distance-limit.impact-sound", -1);
+ if (sqrMaxLightningImpactSoundDistance < 0) {
+ sqrMaxLightningImpactSoundDistance = 32 * 32; //Vanilla value
+ } else {
+ sqrMaxLightningImpactSoundDistance *= sqrMaxLightningImpactSoundDistance;
+ }
+
+ maxLightningFlashDistance = getInt("lightning-strike-distance-limit.flash", -1);
+ if (maxLightningFlashDistance < 0) {
+ maxLightningFlashDistance = 512; // Vanilla value
+ }
+ }
2019-12-12 17:20:43 +01:00
+
2019-07-03 22:44:07 +02:00
public int fixedInhabitedTime;
private void fixedInhabitedTime() {
2019-12-12 17:20:43 +01:00
if (PaperConfig.version < 16) {
2018-09-14 17:49:25 +02:00
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
2020-05-02 00:03:47 +02:00
index 7c518983a9..bdb534deb4 100644
2018-09-14 17:49:25 +02:00
--- a/src/main/java/net/minecraft/server/EntityLightning.java
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
2019-05-05 10:33:44 +02:00
@@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
2019-12-12 17:20:43 +01:00
double deltaX = this.locX() - player.locX();
double deltaZ = this.locZ() - player.locZ();
2018-09-14 17:49:25 +02:00
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
+ // Paper start - Limit lightning strike effect distance
2018-10-17 03:40:32 +02:00
+ if (distanceSquared <= this.world.paperConfig.sqrMaxLightningImpactSoundDistance) {
2018-09-14 17:49:25 +02:00
+ player.playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(SoundEffects.ENTITY_LIGHTNING_BOLT_IMPACT,
2019-12-12 19:45:00 +01:00
+ SoundCategory.WEATHER, this.locX(), this.locY(), this.locZ(), 2.0f, 0.5F + this.random.nextFloat() * 0.2F));
2018-11-23 08:23:50 +01:00
+ }
+
+ if (world.paperConfig.sqrMaxThunderDistance != -1 && distanceSquared >= world.paperConfig.sqrMaxThunderDistance) {
2018-10-17 03:40:32 +02:00
+ continue;
2018-09-14 17:49:25 +02:00
+ }
2018-11-23 08:23:50 +01:00
+
2018-09-14 17:49:25 +02:00
+ // Paper end
if (distanceSquared > viewDistance * viewDistance) {
double deltaLength = Math.sqrt(distanceSquared);
2019-12-12 17:20:43 +01:00
double relativeX = player.locX() + (deltaX / deltaLength) * viewDistance;
2019-05-05 10:33:44 +02:00
@@ -74,7 +85,7 @@ public class EntityLightning extends Entity {
2018-09-14 17:49:25 +02:00
}
}
// CraftBukkit end
2019-12-12 17:20:43 +01:00
- this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F);
+ //this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F); // Paper - Limit lightning strike effect distance (the packet is now sent from inside the loop)
2018-09-14 17:49:25 +02:00
}
--this.lifeTicks;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
2020-05-06 09:44:47 +02:00
index ad779650ed..a75034079b 100644
2018-09-14 17:49:25 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2020-05-06 09:44:47 +02:00
@@ -1288,7 +1288,7 @@ public class WorldServer extends World {
2018-09-14 17:49:25 +02:00
}
// CraftBukkit end
2019-05-05 10:33:44 +02:00
this.globalEntityList.add(entitylightning);
2019-12-12 17:20:43 +01:00
- this.server.getPlayerList().sendPacketNearby((EntityHuman) null, entitylightning.locX(), entitylightning.locY(), entitylightning.locZ(), 512.0D, this, new PacketPlayOutSpawnEntityWeather(entitylightning)); // Paper - use world instead of dimension
+ this.server.getPlayerList().sendPacketNearby((EntityHuman) null, entitylightning.locX(), entitylightning.locY(), entitylightning.locZ(), paperConfig.maxLightningFlashDistance, this, new PacketPlayOutSpawnEntityWeather(entitylightning)); // Paper - use world instead of dimension, limit lightning strike effect distance
2019-05-05 10:33:44 +02:00
}
@Override
2018-09-14 17:49:25 +02:00
--
2020-05-06 09:44:47 +02:00
2.26.0
2018-09-14 17:49:25 +02:00