Paper/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch

87 lines
3.4 KiB
Diff
Raw Normal View History

2015-06-01 11:22:52 +02:00
From 7dca647cde6af64bce68379982822bd9046224f4 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
2015-02-28 12:36:22 +01:00
index d355e68..286fdef 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);
}
2015-02-28 12:36:22 +01:00
@@ -52,12 +54,19 @@ public class EntityLightning extends EntityWeather {
2014-11-28 02:17:45 +01:00
}
}
}
2014-11-28 02:17:45 +01:00
+ }
+ // 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;
2014-11-28 02:17:45 +01:00
}
+ // Spigot end
2014-11-28 02:17:45 +01:00
2015-02-28 12:36:22 +01:00
public void t_() {
super.t_();
- 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
2015-04-09 05:39:59 +02:00
index a4d396d..a3e8d48 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2015-04-09 05:39:59 +02:00
@@ -1436,6 +1436,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
2014-11-28 02:17:45 +01:00
index 243e8e5..0bacc83 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
2014-11-28 02:17:45 +01:00
@@ -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;
+ }
2014-11-28 02:17:45 +01:00
};
@Override
--
2015-05-09 22:23:26 +02:00
2.1.4