diff --git a/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch b/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch
index 02263123d8..4c78a2556f 100644
--- a/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch
+++ b/Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch
@@ -10,8 +10,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
-     /**
-      * @see Server#getPlayer(String name)
+      * <p>
+      * This method may not return objects for offline players.
+      *
+-     * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer
+-     *     guaranteed to be unique
+      * @param name the name to look up
+      * @return a player if one was found, null otherwise
       */
 -    @Deprecated
      public static Player getPlayer(String name) {
@@ -19,20 +24,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
 @@ -0,0 +0,0 @@ public final class Bukkit {
      /**
-      * @see Server#matchPlayer(String name)
-      */
--    @Deprecated
-     public static List<Player> matchPlayer(String name) {
-         return server.matchPlayer(name);
-     }
-@@ -0,0 +0,0 @@ public final class Bukkit {
-     /**
-      * @see Server#getPlayerExact(String name)
+      * Gets the player with the exact given name, case insensitive.
+      *
+-     * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer
+-     *     guaranteed to be unique
+      * @param name Exact name of the player to retrieve
+      * @return a player object if one was found, null otherwise
       */
 -    @Deprecated
      public static Player getPlayerExact(String name) {
          return server.getPlayerExact(name);
      }
+@@ -0,0 +0,0 @@ public final class Bukkit {
+      * This list is not sorted in any particular order. If an exact match is
+      * found, the returned list will only contain a single result.
+      *
+-     * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer
+-     *     guaranteed to be unique
+      * @param name the (partial) name to match
+      * @return list of all possible players
+      */
+-    @Deprecated
+     public static List<Player> matchPlayer(String name) {
+         return server.matchPlayer(name);
+     }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/Server.java
diff --git a/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch b/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch
deleted file mode 100644
index 31eb9299ed..0000000000
--- a/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Mon, 1 Sep 2014 19:36:20 +1000
-Subject: [PATCH] Skip loading of plugins which are not 1.8 compatible.
-
-As they do not work with Spigot 1.8 builds!
-
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
-             try {
-                 description = loader.getPluginDescription(file);
-                 String name = description.getName();
-+                // Spigot Start
-+                if ( name.equalsIgnoreCase( "Orebfuscator" ) )
-+                {
-+                    server.getLogger().log( Level.WARNING, "Skipping loading of Orebfuscator as it does not work with Spigot 1.8 builds!" );
-+                    continue;
-+                }
-+                // Spigot End
-                 if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) {
-                     server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': Restricted Name");
-                     continue;
---
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0049-Watchdog-Thread.patch b/CraftBukkit-Patches/0049-Watchdog-Thread.patch
index 57a51c414c..261af25dda 100644
--- a/CraftBukkit-Patches/0049-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0049-Watchdog-Thread.patch
@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
+index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000000
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -0,0 +0,0 @@
diff --git a/CraftBukkit-Patches/0061-Particle-API.patch b/CraftBukkit-Patches/0061-Particle-API.patch
index 141243b579..9ec5462df9 100644
--- a/CraftBukkit-Patches/0061-Particle-API.patch
+++ b/CraftBukkit-Patches/0061-Particle-API.patch
@@ -14,6 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              break;
 +        case ITEM_BREAK:
 +            datavalue = ((Material) data).getId();
++            break;
          default:
              datavalue = 0;
          }