Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0109-Implement-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From 1a0029c6cbdf522e8b1cdd6d7d834b0360ae0c73 Mon Sep 17 00:00:00 2001
+From 84c1d0d0a562ceea87ea7203113102e48a0ed3c9 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
@@ -37,10 +37,10 @@ index 2fd88c0..35806d1 100644
              this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + 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 827ec16..154b868 100644
+index 58c64fd..19cff55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1326,6 +1326,22 @@ public class CraftWorld implements World {
+@@ -1330,6 +1330,22 @@ public class CraftWorld implements World {
          {
              CraftWorld.this.playEffect( location, effect, 0 );
          }
@@ -101,5 +101,5 @@ index 64e346d..be4f10f 100644
 +    // Spigot end
  }
 -- 
-1.8.3.2
+1.9.1