86 lines
3.4 KiB
Diff
86 lines
3.4 KiB
Diff
From 55e5d79ca141027b6c7baa4be95f98e0388f52ee Mon Sep 17 00:00:00 2001
|
|
From: drXor <mcyoungsota@gmail.com>
|
|
Date: Sun, 23 Feb 2014 16:16:59 -0400
|
|
Subject: [PATCH] Implement Silenceable Lightning API
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
|
|
index 5bda5d3..1bbce9b 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLightning.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
|
|
@@ -13,6 +13,8 @@ public class EntityLightning extends EntityWeather {
|
|
// CraftBukkit start
|
|
public boolean isEffect = false;
|
|
|
|
+ public boolean isSilent = false; // Spigot
|
|
+
|
|
public EntityLightning(World world, double d0, double d1, double d2) {
|
|
this(world, d0, d1, d2, false);
|
|
}
|
|
@@ -53,12 +55,19 @@ public class EntityLightning extends EntityWeather {
|
|
}
|
|
}
|
|
}
|
|
+ }
|
|
|
|
+ // Spigot start
|
|
+ public EntityLightning(World world, double d0, double d1, double d2, boolean isEffect, boolean isSilent)
|
|
+ {
|
|
+ this( world, d0, d1, d2, isEffect );
|
|
+ this.isSilent = isSilent;
|
|
}
|
|
+ // Spigot end
|
|
|
|
public void s_() {
|
|
super.s_();
|
|
- if (this.lifeTicks == 2) {
|
|
+ if (!isSilent && this.lifeTicks == 2) { // Spigot
|
|
// CraftBukkit start - Use relative location for far away sounds
|
|
//this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
|
|
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index b8d30f5..bb4cb9d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -1414,6 +1414,22 @@ public class CraftWorld implements World {
|
|
{
|
|
CraftWorld.this.playEffect( location, effect, 0 );
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public LightningStrike strikeLightning(Location loc, boolean isSilent)
|
|
+ {
|
|
+ EntityLightning lightning = new EntityLightning( world, loc.getX(), loc.getY(), loc.getZ(), false, isSilent );
|
|
+ world.strikeLightning( lightning );
|
|
+ return new CraftLightningStrike( server, lightning );
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public LightningStrike strikeLightningEffect(Location loc, boolean isSilent)
|
|
+ {
|
|
+ EntityLightning lightning = new EntityLightning( world, loc.getX(), loc.getY(), loc.getZ(), true, isSilent );
|
|
+ world.strikeLightning( lightning );
|
|
+ return new CraftLightningStrike( server, lightning );
|
|
+ }
|
|
};
|
|
|
|
public Spigot spigot()
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
|
|
index 243e8e5..0bacc83 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
|
|
@@ -31,6 +31,11 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
|
|
// Spigot start
|
|
private final LightningStrike.Spigot spigot = new LightningStrike.Spigot() {
|
|
|
|
+ @Override
|
|
+ public boolean isSilent()
|
|
+ {
|
|
+ return getHandle().isSilent;
|
|
+ }
|
|
};
|
|
|
|
@Override
|
|
--
|
|
2.1.0
|
|
|