Merge some stuff from upstream.

By: md_5 <git@md-5.net>

Bukkit-Patches/0024-Silenceable-Lightning-API.patch

@@ -1,14 +1,14 @@
-From ee7e81c4564a2917dbf3432275366f1e0a0d5eba Mon Sep 17 00:00:00 2001
+From 4a9e3da0eefb80e5c6eea75b99f965da7d4d7354 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:29 -0400
 Subject: [PATCH] Silenceable Lightning API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a58eb05..80ca41a 100644
+index 6cf3ff0..ab73174 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1196,6 +1196,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1200,6 +1200,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }