From b528389cd048bac597f2a0c130fbf44a93a32bb3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 29 May 2015 19:35:21 +1000
Subject: [PATCH] Rebuild patches for scoreboard API pull to Bukkit.

---
 ... => 0022-Add-Score.isScoreSet-Z-API.patch} |   0
 ...-team-API-to-allow-arbitrary-strings.patch |  73 -----------
 ...> 0023-Add-PlayerSpawnLocationEvent.patch} |   0
 ...lassLoader-Deadlocks-Where-Possible.patch} |   0
 ...slow-tab-complete-for-some-commands.patch} |   0
 ...ndeprecate-Player-updateInventory-V.patch} |   0
 ...able-and-setUnbreakable-to-ItemMeta.patch} |   0
 ...I.patch => 0028-BungeeCord-Chat-API.patch} |   0
 .../0003-Skeleton-API-Implementations.patch   |  31 -----
 ... => 0108-Add-Score.isScoreSet-Z-API.patch} |   0
 ...-team-API-to-allow-arbitrary-strings.patch | 114 ------------------
 ...h => 0109-Log-null-TileEntity-Owner.patch} |   0
 ...al-case-invalid-usernames-for-UUIDs.patch} |   0
 ...=> 0111-Convert-player-skulls-async.patch} |   0
 ...sDefError-crash-and-notify-on-crash.patch} |   0
 ....patch => 0113-Check-Skull-canPlace.patch} |   0
 ...n-that-could-kill-connections-befor.patch} |   0
 ... => 0115-Configurable-UserCache-cap.patch} |   4 +-
 ...-Implement-PlayerSpawnLocationEvent.patch} |   0
 ... => 0117-Cap-Objective-Score-Length.patch} |   0
 ...ion-input-on-the-main-thread.-Fixes.patch} |   0
 ...ble-save-on-stop-only-for-UserCache.patch} |   4 +-
 ...0-Prevent-Unbounded-IntCache-Growth.patch} |   4 +-
 ...-Add-damager-to-the-unhandled-error.patch} |   0
 ...22-Cross-World-Entity-Teleportation.patch} |   0
 ...block-placement-interaction-packets.patch} |   0
 ...atch => 0124-Better-item-validation.patch} |   0
 ... => 0125-Further-Seed-Customisation.patch} |   0
 ...> 0126-Disable-ResourceLeakDetector.patch} |   0
 ...-Information-to-session.lock-Errors.patch} |   0
 ...ng.patch => 0128-Safer-JSON-Loading.patch} |   0
 ... => 0129-Fix-Slow-Loading-Libraries.patch} |   0
 ...h => 0130-Add-CommandLine-EULA-Flag.patch} |   0
 ...g-table-wiping-meta-when-placing-st.patch} |   0
 ...-ocelots-when-plugins-spawn-ocelots.patch} |   0
 ...revent-a-crash-involving-attributes.patch} |   0
 ...ke-moved-wrongly-limit-configurable.patch} |   4 +-
 ...=> 0135-Fix-Null-Tile-Entity-Worlds.patch} |   0
 ...oved-too-quickly-limit-configurable.patch} |   4 +-
 ...Apply-NBTReadLimiter-to-more-things.patch} |   0
 ...tch => 0138-Allow-Attribute-Capping.patch} |   4 +-
 ...fetch-an-online-UUID-in-online-mode.patch} |   0
 ...modifiers-which-cause-the-attribute.patch} |   0
 ...h => 0141-Plug-WorldMap-Memory-Leak.patch} |   0
 ...=> 0142-Fix-Corrupted-Trapped-Chest.patch} |   0
 ...h => 0143-Remove-uneeded-validation.patch} |   0
 ...ch => 0144-Add-Hunger-Config-Values.patch} |   0
 ...> 0145-Make-debug-logging-togglable.patch} |   4 +-
 ...p-invalid-enchants-in-CraftMetaItem.patch} |   0
 ...0147-Limit-TNT-Detonations-per-tick.patch} |   0
 ...able-and-setUnbreakable-to-ItemMeta.patch} |   0
 ...h => 0149-Configurable-Hanging-Tick.patch} |   0
 ...tch => 0150-Refactor-ItemDoor-Place.patch} |   0
 ...I.patch => 0151-BungeeCord-Chat-API.patch} |   0
 ...-Use-Standard-List-for-EntitySlices.patch} |   0
 ...Allow-Capping-Tile-Entity-Tick-Time.patch} |   0
 ...stMatches-for-ItemStack-Dirty-Check.patch} |   0
 ... 0155-Use-CLQ-for-main-thread-tasks.patch} |   0
 58 files changed, 7 insertions(+), 239 deletions(-)
 rename Bukkit-Patches/{0023-Add-Score.isScoreSet-Z-API.patch => 0022-Add-Score.isScoreSet-Z-API.patch} (100%)
 delete mode 100644 Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
 rename Bukkit-Patches/{0024-Add-PlayerSpawnLocationEvent.patch => 0023-Add-PlayerSpawnLocationEvent.patch} (100%)
 rename Bukkit-Patches/{0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch => 0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch} (100%)
 rename Bukkit-Patches/{0026-Fix-slow-tab-complete-for-some-commands.patch => 0025-Fix-slow-tab-complete-for-some-commands.patch} (100%)
 rename Bukkit-Patches/{0027-Undeprecate-Player-updateInventory-V.patch => 0026-Undeprecate-Player-updateInventory-V.patch} (100%)
 rename Bukkit-Patches/{0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch => 0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch} (100%)
 rename Bukkit-Patches/{0029-BungeeCord-Chat-API.patch => 0028-BungeeCord-Chat-API.patch} (100%)
 rename CraftBukkit-Patches/{0109-Add-Score.isScoreSet-Z-API.patch => 0108-Add-Score.isScoreSet-Z-API.patch} (100%)
 delete mode 100644 CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch
 rename CraftBukkit-Patches/{0110-Log-null-TileEntity-Owner.patch => 0109-Log-null-TileEntity-Owner.patch} (100%)
 rename CraftBukkit-Patches/{0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch => 0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch} (100%)
 rename CraftBukkit-Patches/{0112-Convert-player-skulls-async.patch => 0111-Convert-player-skulls-async.patch} (100%)
 rename CraftBukkit-Patches/{0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch => 0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch} (100%)
 rename CraftBukkit-Patches/{0114-Check-Skull-canPlace.patch => 0113-Check-Skull-canPlace.patch} (100%)
 rename CraftBukkit-Patches/{0115-Fix-race-condition-that-could-kill-connections-befor.patch => 0114-Fix-race-condition-that-could-kill-connections-befor.patch} (100%)
 rename CraftBukkit-Patches/{0116-Configurable-UserCache-cap.patch => 0115-Configurable-UserCache-cap.patch} (98%)
 rename CraftBukkit-Patches/{0117-Implement-PlayerSpawnLocationEvent.patch => 0116-Implement-PlayerSpawnLocationEvent.patch} (100%)
 rename CraftBukkit-Patches/{0118-Cap-Objective-Score-Length.patch => 0117-Cap-Objective-Score-Length.patch} (100%)
 rename CraftBukkit-Patches/{0119-Process-conversation-input-on-the-main-thread.-Fixes.patch => 0118-Process-conversation-input-on-the-main-thread.-Fixes.patch} (100%)
 rename CraftBukkit-Patches/{0120-Configurable-save-on-stop-only-for-UserCache.patch => 0119-Configurable-save-on-stop-only-for-UserCache.patch} (99%)
 rename CraftBukkit-Patches/{0121-Prevent-Unbounded-IntCache-Growth.patch => 0120-Prevent-Unbounded-IntCache-Growth.patch} (99%)
 rename CraftBukkit-Patches/{0122-Add-damager-to-the-unhandled-error.patch => 0121-Add-damager-to-the-unhandled-error.patch} (100%)
 rename CraftBukkit-Patches/{0123-Cross-World-Entity-Teleportation.patch => 0122-Cross-World-Entity-Teleportation.patch} (100%)
 rename CraftBukkit-Patches/{0124-Limit-block-placement-interaction-packets.patch => 0123-Limit-block-placement-interaction-packets.patch} (100%)
 rename CraftBukkit-Patches/{0125-Better-item-validation.patch => 0124-Better-item-validation.patch} (100%)
 rename CraftBukkit-Patches/{0126-Further-Seed-Customisation.patch => 0125-Further-Seed-Customisation.patch} (100%)
 rename CraftBukkit-Patches/{0127-Disable-ResourceLeakDetector.patch => 0126-Disable-ResourceLeakDetector.patch} (100%)
 rename CraftBukkit-Patches/{0128-Add-More-Information-to-session.lock-Errors.patch => 0127-Add-More-Information-to-session.lock-Errors.patch} (100%)
 rename CraftBukkit-Patches/{0129-Safer-JSON-Loading.patch => 0128-Safer-JSON-Loading.patch} (100%)
 rename CraftBukkit-Patches/{0130-Fix-Slow-Loading-Libraries.patch => 0129-Fix-Slow-Loading-Libraries.patch} (100%)
 rename CraftBukkit-Patches/{0131-Add-CommandLine-EULA-Flag.patch => 0130-Add-CommandLine-EULA-Flag.patch} (100%)
 rename CraftBukkit-Patches/{0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch => 0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch} (100%)
 rename CraftBukkit-Patches/{0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch => 0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch} (100%)
 rename CraftBukkit-Patches/{0134-Prevent-a-crash-involving-attributes.patch => 0133-Prevent-a-crash-involving-attributes.patch} (100%)
 rename CraftBukkit-Patches/{0135-Make-moved-wrongly-limit-configurable.patch => 0134-Make-moved-wrongly-limit-configurable.patch} (98%)
 rename CraftBukkit-Patches/{0136-Fix-Null-Tile-Entity-Worlds.patch => 0135-Fix-Null-Tile-Entity-Worlds.patch} (100%)
 rename CraftBukkit-Patches/{0137-Make-moved-too-quickly-limit-configurable.patch => 0136-Make-moved-too-quickly-limit-configurable.patch} (99%)
 rename CraftBukkit-Patches/{0138-Apply-NBTReadLimiter-to-more-things.patch => 0137-Apply-NBTReadLimiter-to-more-things.patch} (100%)
 rename CraftBukkit-Patches/{0139-Allow-Attribute-Capping.patch => 0138-Allow-Attribute-Capping.patch} (99%)
 rename CraftBukkit-Patches/{0140-Only-fetch-an-online-UUID-in-online-mode.patch => 0139-Only-fetch-an-online-UUID-in-online-mode.patch} (100%)
 rename CraftBukkit-Patches/{0141-Filter-attribute-modifiers-which-cause-the-attribute.patch => 0140-Filter-attribute-modifiers-which-cause-the-attribute.patch} (100%)
 rename CraftBukkit-Patches/{0142-Plug-WorldMap-Memory-Leak.patch => 0141-Plug-WorldMap-Memory-Leak.patch} (100%)
 rename CraftBukkit-Patches/{0143-Fix-Corrupted-Trapped-Chest.patch => 0142-Fix-Corrupted-Trapped-Chest.patch} (100%)
 rename CraftBukkit-Patches/{0144-Remove-uneeded-validation.patch => 0143-Remove-uneeded-validation.patch} (100%)
 rename CraftBukkit-Patches/{0145-Add-Hunger-Config-Values.patch => 0144-Add-Hunger-Config-Values.patch} (100%)
 rename CraftBukkit-Patches/{0146-Make-debug-logging-togglable.patch => 0145-Make-debug-logging-togglable.patch} (99%)
 rename CraftBukkit-Patches/{0147-Skip-invalid-enchants-in-CraftMetaItem.patch => 0146-Skip-invalid-enchants-in-CraftMetaItem.patch} (100%)
 rename CraftBukkit-Patches/{0148-Limit-TNT-Detonations-per-tick.patch => 0147-Limit-TNT-Detonations-per-tick.patch} (100%)
 rename CraftBukkit-Patches/{0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch => 0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch} (100%)
 rename CraftBukkit-Patches/{0150-Configurable-Hanging-Tick.patch => 0149-Configurable-Hanging-Tick.patch} (100%)
 rename CraftBukkit-Patches/{0151-Refactor-ItemDoor-Place.patch => 0150-Refactor-ItemDoor-Place.patch} (100%)
 rename CraftBukkit-Patches/{0152-BungeeCord-Chat-API.patch => 0151-BungeeCord-Chat-API.patch} (100%)
 rename CraftBukkit-Patches/{0153-Use-Standard-List-for-EntitySlices.patch => 0152-Use-Standard-List-for-EntitySlices.patch} (100%)
 rename CraftBukkit-Patches/{0154-Allow-Capping-Tile-Entity-Tick-Time.patch => 0153-Allow-Capping-Tile-Entity-Tick-Time.patch} (100%)
 rename CraftBukkit-Patches/{0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch => 0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch} (100%)
 rename CraftBukkit-Patches/{0156-Use-CLQ-for-main-thread-tasks.patch => 0155-Use-CLQ-for-main-thread-tasks.patch} (100%)

diff --git a/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch b/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch
similarity index 100%
rename from Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch
rename to Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch
diff --git a/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch b/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
deleted file mode 100644
index 6d1dad51f0..0000000000
--- a/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Thu, 17 Apr 2014 19:22:26 +1000
-Subject: [PATCH] Expand team API to allow arbitrary strings.
-
-
-diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/scoreboard/Team.java
-+++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -0,0 +0,0 @@ public interface Team {
-      */
-     Set<OfflinePlayer> getPlayers() throws IllegalStateException;
- 
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #getPlayers()
-+     */
-+    Set<String> getEntries() throws IllegalStateException;
-+    // Spigot End
-+
-     /**
-      * Gets the size of the team
-      *
-@@ -0,0 +0,0 @@ public interface Team {
-      */
-     void addPlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
- 
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #addPlayer(org.bukkit.OfflinePlayer)
-+     */
-+    void addEntry(String entry) throws IllegalStateException, IllegalArgumentException;
-+    // Spigot end
-+
-     /**
-      * Removes the player from this team.
-      *
-@@ -0,0 +0,0 @@ public interface Team {
-      */
-     boolean removePlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
- 
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #removePlayer(org.bukkit.OfflinePlayer)
-+     */
-+    boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException;
-+    // Spigot end
-+
-     /**
-      * Unregisters this team from the Scoreboard
-      *
-@@ -0,0 +0,0 @@ public interface Team {
-      * @throws IllegalStateException if this team has been unregistered
-      */
-     boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException;
-+
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #hasPlayer(org.bukkit.OfflinePlayer)
-+     */
-+    boolean hasEntry(String entry) throws IllegalArgumentException,IllegalStateException;
-+    // Spigot end
- }
---
\ No newline at end of file
diff --git a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch b/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch
similarity index 100%
rename from Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch
rename to Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch
diff --git a/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch b/Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch
similarity index 100%
rename from Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch
rename to Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch
diff --git a/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch
similarity index 100%
rename from Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch
rename to Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch
diff --git a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch b/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch
similarity index 100%
rename from Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch
rename to Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch
diff --git a/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
similarity index 100%
rename from Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
rename to Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
diff --git a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch
similarity index 100%
rename from Bukkit-Patches/0029-BungeeCord-Chat-API.patch
rename to Bukkit-Patches/0028-BungeeCord-Chat-API.patch
diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index fa3762c27e..61b5a51cb5 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -159,36 +159,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        throw new UnsupportedOperationException("Not supported yet.");
 +    }
 +    // Spigot end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
-     }
- 
-+    // Spigot start
-+    @Override
-+    public Set<String> getEntries() throws IllegalStateException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+
-+    @Override
-+    public void addEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+
-+    @Override
-+    public boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+
-+    @Override
-+    public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+    // Spigot end
- 
  }
 --
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch
similarity index 100%
rename from CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch
rename to CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch
diff --git a/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch
deleted file mode 100644
index d2416bb37a..0000000000
--- a/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Thu, 17 Apr 2014 19:22:22 +1000
-Subject: [PATCH] Expand team API to allow arbitrary strings.
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         return players.build();
-     }
- 
-+    // Spigot start
-+    @Override
-+    public Set<String> getEntries() throws IllegalStateException {
-+        CraftScoreboard scoreboard = checkState();
-+        
-+        ImmutableSet.Builder<String> entries = ImmutableSet.builder();
-+        for (Object o : team.getPlayerNameSet()){
-+            entries.add(o.toString());
-+        }
-+        return entries.build();
-+    }
-+    // Spigot end
-+
-     public int getSize() throws IllegalStateException {
-         CraftScoreboard scoreboard = checkState();
- 
-@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
- 
-     public void addPlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException {
-         Validate.notNull(player, "OfflinePlayer cannot be null");
-+        // Spigot Start
-+        addEntry(player.getName());
-+    }
-+    
-+    public void addEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        Validate.notNull(entry, "Entry cannot be null");
-         CraftScoreboard scoreboard = checkState();
- 
--        scoreboard.board.addPlayerToTeam(player.getName(), team.getName());
-+        scoreboard.board.addPlayerToTeam(entry, team.getName());
-+        // Spigot end
-     }
- 
-     public boolean removePlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException {
-         Validate.notNull(player, "OfflinePlayer cannot be null");
-+        // Spigot start
-+        return removeEntry(player.getName());
-+    }
-+    
-+    public boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        Validate.notNull(entry, "Entry cannot be null");
-         CraftScoreboard scoreboard = checkState();
- 
--        if (!team.getPlayerNameSet().contains(player.getName())) {
-+        if (!team.getPlayerNameSet().contains(entry)) {
-             return false;
-         }
- 
--        scoreboard.board.removePlayerFromTeam(player.getName(), team);
-+        scoreboard.board.removePlayerFromTeam(entry, team);
-+        // Spigot end
-         return true;
-     }
- 
-     public boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException {
-         Validate.notNull(player, "OfflinePlayer cannot be null");
-+        // Spigot start
-+        return hasEntry(player.getName());
-+    }
-+
-+    public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
-+        Validate.notNull("Entry cannot be null");
-+
-         CraftScoreboard scoreboard = checkState();
- 
--        return team.getPlayerNameSet().contains(player.getName());
-+        return team.getPlayerNameSet().contains(entry);
-+        // Spigot end
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         final CraftTeam other = (CraftTeam) obj;
-         return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
-     }
--
--    // Spigot start
--    @Override
--    public Set<String> getEntries() throws IllegalStateException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
--
--    @Override
--    public void addEntry(String entry) throws IllegalStateException, IllegalArgumentException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
--
--    @Override
--    public boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
--
--    @Override
--    public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
-     // Spigot end
- 
- }
---
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch
similarity index 100%
rename from CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch
rename to CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch
diff --git a/CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch
similarity index 100%
rename from CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch
rename to CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch
diff --git a/CraftBukkit-Patches/0112-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0111-Convert-player-skulls-async.patch
similarity index 100%
rename from CraftBukkit-Patches/0112-Convert-player-skulls-async.patch
rename to CraftBukkit-Patches/0111-Convert-player-skulls-async.patch
diff --git a/CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
similarity index 100%
rename from CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
rename to CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
diff --git a/CraftBukkit-Patches/0114-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0113-Check-Skull-canPlace.patch
similarity index 100%
rename from CraftBukkit-Patches/0114-Check-Skull-canPlace.patch
rename to CraftBukkit-Patches/0113-Check-Skull-canPlace.patch
diff --git a/CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch
similarity index 100%
rename from CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch
rename to CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch
diff --git a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch
similarity index 98%
rename from CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch
rename to CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch
index 821827e35e..7df68c5ad2 100644
--- a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch
+++ b/CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch
@@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        userCacheCap = getInt( "settings.user-cache-size", 1000 );
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch
similarity index 100%
rename from CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch
rename to CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch
diff --git a/CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch
similarity index 100%
rename from CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch
rename to CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch
diff --git a/CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch
similarity index 100%
rename from CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch
rename to CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch
diff --git a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch
similarity index 99%
rename from CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch
rename to CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch
index 54c50f9eb6..d63f5d474f 100644
--- a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch
+++ b/CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch
@@ -51,6 +51,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        saveUserCacheOnStopOnly = getBoolean( "settings.save-user-cache-on-stop-only", false );
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch
similarity index 99%
rename from CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch
rename to CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch
index f5ed2d65fe..f61e9ace8b 100644
--- a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch
+++ b/CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch
@@ -57,6 +57,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        intCacheLimit = getInt( "settings.int-cache-limit", 1024 );
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch
similarity index 100%
rename from CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch
rename to CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch
diff --git a/CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch
similarity index 100%
rename from CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch
rename to CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch
diff --git a/CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch
similarity index 100%
rename from CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch
rename to CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch
diff --git a/CraftBukkit-Patches/0125-Better-item-validation.patch b/CraftBukkit-Patches/0124-Better-item-validation.patch
similarity index 100%
rename from CraftBukkit-Patches/0125-Better-item-validation.patch
rename to CraftBukkit-Patches/0124-Better-item-validation.patch
diff --git a/CraftBukkit-Patches/0126-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0125-Further-Seed-Customisation.patch
similarity index 100%
rename from CraftBukkit-Patches/0126-Further-Seed-Customisation.patch
rename to CraftBukkit-Patches/0125-Further-Seed-Customisation.patch
diff --git a/CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch
similarity index 100%
rename from CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch
rename to CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch
diff --git a/CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch
similarity index 100%
rename from CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch
rename to CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch
diff --git a/CraftBukkit-Patches/0129-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0128-Safer-JSON-Loading.patch
similarity index 100%
rename from CraftBukkit-Patches/0129-Safer-JSON-Loading.patch
rename to CraftBukkit-Patches/0128-Safer-JSON-Loading.patch
diff --git a/CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch
similarity index 100%
rename from CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch
rename to CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch
diff --git a/CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch
similarity index 100%
rename from CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch
rename to CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch
diff --git a/CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
similarity index 100%
rename from CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
rename to CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
diff --git a/CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
similarity index 100%
rename from CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
rename to CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
diff --git a/CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch
similarity index 100%
rename from CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch
rename to CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch
diff --git a/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch
similarity index 98%
rename from CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch
rename to CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch
index 3a68a50672..2346256e9c 100644
--- a/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch
@@ -33,6 +33,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        movedWronglyThreshold = getDouble( "settings.moved-wrongly-threshold", 0.0625D );
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch
similarity index 100%
rename from CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch
rename to CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch
diff --git a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch
similarity index 99%
rename from CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch
rename to CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch
index 4936e81675..d826a7e803 100644
--- a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch
@@ -33,6 +33,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        movedTooQuicklyThreshold = getDouble( "settings.moved-too-quickly-threshold", 100.0D );
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch
similarity index 100%
rename from CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch
rename to CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch
diff --git a/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch
similarity index 99%
rename from CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch
rename to CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch
index 87af81b50a..6eb5c6d76e 100644
--- a/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch
+++ b/CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch
@@ -70,6 +70,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        ( (AttributeRanged) GenericAttributes.ATTACK_DAMAGE ).b = attackDamage;
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch
similarity index 100%
rename from CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch
rename to CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch
diff --git a/CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch
similarity index 100%
rename from CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch
rename to CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch
diff --git a/CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch
similarity index 100%
rename from CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch
rename to CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch
diff --git a/CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch
similarity index 100%
rename from CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch
rename to CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch
diff --git a/CraftBukkit-Patches/0144-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0143-Remove-uneeded-validation.patch
similarity index 100%
rename from CraftBukkit-Patches/0144-Remove-uneeded-validation.patch
rename to CraftBukkit-Patches/0143-Remove-uneeded-validation.patch
diff --git a/CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch
similarity index 100%
rename from CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch
rename to CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch
diff --git a/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch
similarity index 99%
rename from CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch
rename to CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch
index 79d2ef6197..6dafbdbea4 100644
--- a/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch
+++ b/CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch
@@ -62,6 +62,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          </Root>
      </Loggers>
  </Configuration>
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch
similarity index 100%
rename from CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch
rename to CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch
diff --git a/CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch
similarity index 100%
rename from CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch
rename to CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch
diff --git a/CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
similarity index 100%
rename from CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
rename to CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
diff --git a/CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch
similarity index 100%
rename from CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch
rename to CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch
diff --git a/CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch
similarity index 100%
rename from CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch
rename to CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch
diff --git a/CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch
similarity index 100%
rename from CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch
rename to CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch
diff --git a/CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch
similarity index 100%
rename from CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch
rename to CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch
diff --git a/CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch
similarity index 100%
rename from CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch
rename to CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch
diff --git a/CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch
similarity index 100%
rename from CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch
rename to CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch
diff --git a/CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch
similarity index 100%
rename from CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch
rename to CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch