diff --git a/Bukkit-Patches/0031-BungeeCord-Chat-API.patch b/Bukkit-Patches/0031-BungeeCord-Chat-API.patch new file mode 100644 index 000000000..d01301339 --- /dev/null +++ b/Bukkit-Patches/0031-BungeeCord-Chat-API.patch @@ -0,0 +1,83 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Sat, 13 Dec 2014 12:59:14 +1100 +Subject: [PATCH] BungeeCord Chat API + + +diff --git a/pom.xml b/pom.xml +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -0,0 +0,0 @@ + commons-lang + 2.6 + ++ ++ net.md-5 ++ bungeecord-chat ++ 1.8-SNAPSHOT ++ jar ++ compile ++ + + + +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 ++++ b/src/main/java/org/bukkit/Server.java +@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient { + { + throw new UnsupportedOperationException( "Not supported yet." ); + } ++ ++ /** ++ * Sends the component to the player ++ * ++ * @param component the components to send ++ */ ++ public void broadcast(net.md_5.bungee.api.chat.BaseComponent component) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ /** ++ * Sends an array of components as a single message to the player ++ * ++ * @param components the components to send ++ */ ++ public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } + } + + Spigot spigot(); +diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/entity/Player.java ++++ b/src/main/java/org/bukkit/entity/Player.java +@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline + { + throw new UnsupportedOperationException( "Not supported yet." ); + } ++ ++ /** ++ * Sends the component to the player ++ * ++ * @param component the components to send ++ */ ++ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ /** ++ * Sends an array of components as a single message to the player ++ * ++ * @param components the components to send ++ */ ++ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } + } + + Spigot spigot(); +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0072-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch similarity index 100% rename from CraftBukkit-Patches/0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch rename to CraftBukkit-Patches/0072-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch diff --git a/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch deleted file mode 100644 index 5b8d2dffb..000000000 --- a/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thinkofdeath -Date: Sat, 18 Jan 2014 14:27:03 +0000 -Subject: [PATCH] Support vanilla's direction tag on fireballs - - -diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/EntityFireball.java -+++ b/src/main/java/net/minecraft/server/EntityFireball.java -@@ -0,0 +0,0 @@ public abstract class EntityFireball extends Entity { - nbttagcompound.setByte("inGround", (byte) (this.i ? 1 : 0)); - // CraftBukkit - Fix direction being mismapped to invalid variables - nbttagcompound.set("power", this.a(new double[] { this.dirX, this.dirY, this.dirZ})); -+ // Spigot - Support vanilla's direction tag -+ nbttagcompound.set("direction", this.a(new double[] { this.motX, this.motY, this.motZ})); - } - - public void a(NBTTagCompound nbttagcompound) { -@@ -0,0 +0,0 @@ public abstract class EntityFireball extends Entity { - this.dirY = nbttaglist.d(1); - this.dirZ = nbttaglist.d(2); - // CraftBukkit end -+ } else if (nbttagcompound.hasKeyOfType("direction", 9)) { // Spigot - Support vanilla's direction tag -+ NBTTagList nbttaglist = nbttagcompound.getList("direction", 6); -+ -+ this.motX = nbttaglist.d(0); -+ this.motY = nbttaglist.d(1); -+ this.motZ = nbttaglist.d(2); -+ - } else { - this.die(); - } --- \ No newline at end of file diff --git a/CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0073-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch similarity index 100% rename from CraftBukkit-Patches/0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch rename to CraftBukkit-Patches/0073-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch diff --git a/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch b/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch deleted file mode 100644 index 71ac1ce16..000000000 --- a/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thinkofdeath -Date: Sat, 18 Jan 2014 19:32:42 +0000 -Subject: [PATCH] Support non-prefixed URLs - - -diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -@@ -0,0 +0,0 @@ import com.google.common.collect.ImmutableMap.Builder; - public final class CraftChatMessage { - private static class StringMessage { - private static final Map formatMap; -- private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|(?:(https?://[^ ][^ ]*?)(?=[\\.\\?!,;:]?(?:[ \\n]|$)))", Pattern.CASE_INSENSITIVE); -+ private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|((?:(?:https?)://)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))", Pattern.CASE_INSENSITIVE); - - static { - Builder builder = ImmutableMap.builder(); -@@ -0,0 +0,0 @@ public final class CraftChatMessage { - } - break; - case 3: -+ if ( !( match.startsWith( "http://" ) || match.startsWith( "https://" ) ) ) { -+ match = "http://" + match; -+ } - modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match)); - appendNewComponent(matcher.end(groupId)); - modifier.setChatClickable((ChatClickable) null); -@@ -0,0 +0,0 @@ public final class CraftChatMessage { - appendNewComponent(message.length()); - } - -- output = list.toArray(new IChatBaseComponent[0]); -+ output = list.toArray(new IChatBaseComponent[list.size()]); - } - - private void appendNewComponent(int index) { --- \ No newline at end of file diff --git a/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch similarity index 100% rename from CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch rename to CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch diff --git a/CraftBukkit-Patches/0077-Add-Spigot-Links.patch b/CraftBukkit-Patches/0075-Add-Spigot-Links.patch similarity index 100% rename from CraftBukkit-Patches/0077-Add-Spigot-Links.patch rename to CraftBukkit-Patches/0075-Add-Spigot-Links.patch diff --git a/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch similarity index 100% rename from CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch diff --git a/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch similarity index 100% rename from CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch diff --git a/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch similarity index 100% rename from CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch diff --git a/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch similarity index 100% rename from CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch diff --git a/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch similarity index 100% rename from CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch diff --git a/CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0081-Fix-dispensing-bone-meal-not-having-the-correct-data.patch similarity index 100% rename from CraftBukkit-Patches/0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch rename to CraftBukkit-Patches/0081-Fix-dispensing-bone-meal-not-having-the-correct-data.patch diff --git a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch similarity index 100% rename from CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch diff --git a/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch similarity index 100% rename from CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch diff --git a/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch similarity index 100% rename from CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch diff --git a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch similarity index 100% rename from CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch diff --git a/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch similarity index 100% rename from CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch diff --git a/CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0087-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch similarity index 100% rename from CraftBukkit-Patches/0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch rename to CraftBukkit-Patches/0087-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch diff --git a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch similarity index 100% rename from CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch diff --git a/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch similarity index 100% rename from CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch diff --git a/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0090-Use-one-PermissibleBase-for-all-Command-Blocks.patch similarity index 100% rename from CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch rename to CraftBukkit-Patches/0090-Use-one-PermissibleBase-for-all-Command-Blocks.patch diff --git a/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch similarity index 100% rename from CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch diff --git a/CraftBukkit-Patches/0094-Guard-Entity-List.patch b/CraftBukkit-Patches/0092-Guard-Entity-List.patch similarity index 100% rename from CraftBukkit-Patches/0094-Guard-Entity-List.patch rename to CraftBukkit-Patches/0092-Guard-Entity-List.patch diff --git a/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 100% rename from CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch diff --git a/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch similarity index 100% rename from CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch diff --git a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch similarity index 100% rename from CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch diff --git a/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0096-Configurable-dragon-death-and-wither-spawn-sounds.patch similarity index 100% rename from CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch rename to CraftBukkit-Patches/0096-Configurable-dragon-death-and-wither-spawn-sounds.patch diff --git a/CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0097-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch similarity index 100% rename from CraftBukkit-Patches/0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch rename to CraftBukkit-Patches/0097-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch diff --git a/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch similarity index 100% rename from CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch rename to CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch diff --git a/CraftBukkit-Patches/0101-Add-Conversion-Message.patch b/CraftBukkit-Patches/0099-Add-Conversion-Message.patch similarity index 100% rename from CraftBukkit-Patches/0101-Add-Conversion-Message.patch rename to CraftBukkit-Patches/0099-Add-Conversion-Message.patch diff --git a/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0100-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch similarity index 100% rename from CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch rename to CraftBukkit-Patches/0100-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch diff --git a/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch similarity index 100% rename from CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch rename to CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch diff --git a/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0102-Use-Offline-Player-Data-Once-if-Required.patch similarity index 100% rename from CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch rename to CraftBukkit-Patches/0102-Use-Offline-Player-Data-Once-if-Required.patch diff --git a/CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0103-Use-Provided-Case-for-Non-Existent-Offline-Players.patch similarity index 100% rename from CraftBukkit-Patches/0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch rename to CraftBukkit-Patches/0103-Use-Provided-Case-for-Non-Existent-Offline-Players.patch diff --git a/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch similarity index 100% rename from CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch rename to CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch diff --git a/CraftBukkit-Patches/0107-Fix-Player-Banning.patch b/CraftBukkit-Patches/0105-Fix-Player-Banning.patch similarity index 100% rename from CraftBukkit-Patches/0107-Fix-Player-Banning.patch rename to CraftBukkit-Patches/0105-Fix-Player-Banning.patch diff --git a/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch similarity index 100% rename from CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch rename to CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch diff --git a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch similarity index 100% rename from CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch rename to CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch diff --git a/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch similarity index 100% rename from CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch rename to CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch diff --git a/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch similarity index 100% rename from CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch rename to CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch diff --git a/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch similarity index 100% rename from CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch rename to CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch diff --git a/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch similarity index 100% rename from CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch rename to CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch diff --git a/CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0112-Don-t-special-case-invalid-usernames-for-UUIDs.patch similarity index 100% rename from CraftBukkit-Patches/0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch rename to CraftBukkit-Patches/0112-Don-t-special-case-invalid-usernames-for-UUIDs.patch diff --git a/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch similarity index 100% rename from CraftBukkit-Patches/0115-Convert-player-skulls-async.patch rename to CraftBukkit-Patches/0113-Convert-player-skulls-async.patch diff --git a/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch similarity index 100% rename from CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch rename to CraftBukkit-Patches/0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch diff --git a/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0115-Check-Skull-canPlace.patch similarity index 100% rename from CraftBukkit-Patches/0117-Check-Skull-canPlace.patch rename to CraftBukkit-Patches/0115-Check-Skull-canPlace.patch diff --git a/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch b/CraftBukkit-Patches/0116-Don-t-let-trees-replace-any-block.patch similarity index 100% rename from CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch rename to CraftBukkit-Patches/0116-Don-t-let-trees-replace-any-block.patch diff --git a/CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0117-Fix-race-condition-that-could-kill-connections-befor.patch similarity index 100% rename from CraftBukkit-Patches/0119-Fix-race-condition-that-could-kill-connections-befor.patch rename to CraftBukkit-Patches/0117-Fix-race-condition-that-could-kill-connections-befor.patch diff --git a/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0118-Configurable-UserCache-cap.patch similarity index 100% rename from CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch rename to CraftBukkit-Patches/0118-Configurable-UserCache-cap.patch diff --git a/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0119-Implement-PlayerSpawnLocationEvent.patch similarity index 100% rename from CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch rename to CraftBukkit-Patches/0119-Implement-PlayerSpawnLocationEvent.patch diff --git a/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0120-Cap-Objective-Score-Length.patch similarity index 100% rename from CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch rename to CraftBukkit-Patches/0120-Cap-Objective-Score-Length.patch diff --git a/CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0121-Process-conversation-input-on-the-main-thread.-Fixes.patch similarity index 100% rename from CraftBukkit-Patches/0123-Process-conversation-input-on-the-main-thread.-Fixes.patch rename to CraftBukkit-Patches/0121-Process-conversation-input-on-the-main-thread.-Fixes.patch diff --git a/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0122-Configurable-save-on-stop-only-for-UserCache.patch similarity index 100% rename from CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch rename to CraftBukkit-Patches/0122-Configurable-save-on-stop-only-for-UserCache.patch diff --git a/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0123-Prevent-Unbounded-IntCache-Growth.patch similarity index 100% rename from CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch rename to CraftBukkit-Patches/0123-Prevent-Unbounded-IntCache-Growth.patch diff --git a/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0124-Add-damager-to-the-unhandled-error.patch similarity index 100% rename from CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch rename to CraftBukkit-Patches/0124-Add-damager-to-the-unhandled-error.patch diff --git a/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0125-Cross-World-Entity-Teleportation.patch similarity index 100% rename from CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch rename to CraftBukkit-Patches/0125-Cross-World-Entity-Teleportation.patch diff --git a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0126-Limit-block-placement-interaction-packets.patch similarity index 100% rename from CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch rename to CraftBukkit-Patches/0126-Limit-block-placement-interaction-packets.patch diff --git a/CraftBukkit-Patches/0129-Better-item-validation.patch b/CraftBukkit-Patches/0127-Better-item-validation.patch similarity index 100% rename from CraftBukkit-Patches/0129-Better-item-validation.patch rename to CraftBukkit-Patches/0127-Better-item-validation.patch diff --git a/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0128-Further-Seed-Customisation.patch similarity index 100% rename from CraftBukkit-Patches/0130-Further-Seed-Customisation.patch rename to CraftBukkit-Patches/0128-Further-Seed-Customisation.patch diff --git a/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0129-Disable-ResourceLeakDetector.patch similarity index 100% rename from CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch rename to CraftBukkit-Patches/0129-Disable-ResourceLeakDetector.patch diff --git a/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0130-Add-More-Information-to-session.lock-Errors.patch similarity index 100% rename from CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch rename to CraftBukkit-Patches/0130-Add-More-Information-to-session.lock-Errors.patch diff --git a/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0131-Safer-JSON-Loading.patch similarity index 100% rename from CraftBukkit-Patches/0133-Safer-JSON-Loading.patch rename to CraftBukkit-Patches/0131-Safer-JSON-Loading.patch diff --git a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0132-Fix-Slow-Loading-Libraries.patch similarity index 97% rename from CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch rename to CraftBukkit-Patches/0132-Fix-Slow-Loading-Libraries.patch index 8eb0708c3..2adb0908a 100644 --- a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0132-Fix-Slow-Loading-Libraries.patch @@ -15,6 +15,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- -1.9.4.msysgit.2 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0133-Add-CommandLine-EULA-Flag.patch similarity index 100% rename from CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch rename to CraftBukkit-Patches/0133-Add-CommandLine-EULA-Flag.patch diff --git a/CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0134-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch similarity index 100% rename from CraftBukkit-Patches/0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch rename to CraftBukkit-Patches/0134-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch diff --git a/CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0135-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch similarity index 100% rename from CraftBukkit-Patches/0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch rename to CraftBukkit-Patches/0135-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch diff --git a/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch similarity index 100% rename from CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch rename to CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch diff --git a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0137-Make-moved-wrongly-limit-configurable.patch similarity index 100% rename from CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch rename to CraftBukkit-Patches/0137-Make-moved-wrongly-limit-configurable.patch diff --git a/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0138-Fix-Null-Tile-Entity-Worlds.patch similarity index 100% rename from CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0138-Fix-Null-Tile-Entity-Worlds.patch diff --git a/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0139-Make-moved-too-quickly-limit-configurable.patch similarity index 100% rename from CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch rename to CraftBukkit-Patches/0139-Make-moved-too-quickly-limit-configurable.patch diff --git a/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0140-Alternative-Hopper-Ticking.patch similarity index 100% rename from CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch rename to CraftBukkit-Patches/0140-Alternative-Hopper-Ticking.patch diff --git a/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0141-Apply-NBTReadLimiter-to-more-things.patch similarity index 100% rename from CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch rename to CraftBukkit-Patches/0141-Apply-NBTReadLimiter-to-more-things.patch diff --git a/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0142-Allow-Attribute-Capping.patch similarity index 100% rename from CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch rename to CraftBukkit-Patches/0142-Allow-Attribute-Capping.patch diff --git a/CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch b/CraftBukkit-Patches/0143-Add-an-option-for-a-global-cache-for-any-request-on-.patch similarity index 100% rename from CraftBukkit-Patches/0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch rename to CraftBukkit-Patches/0143-Add-an-option-for-a-global-cache-for-any-request-on-.patch diff --git a/CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0144-Only-fetch-an-online-UUID-in-online-mode.patch similarity index 100% rename from CraftBukkit-Patches/0146-Only-fetch-an-online-UUID-in-online-mode.patch rename to CraftBukkit-Patches/0144-Only-fetch-an-online-UUID-in-online-mode.patch diff --git a/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0145-Filter-attribute-modifiers-which-cause-the-attribute.patch similarity index 100% rename from CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch rename to CraftBukkit-Patches/0145-Filter-attribute-modifiers-which-cause-the-attribute.patch diff --git a/CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch similarity index 100% rename from CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch rename to CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch diff --git a/CraftBukkit-Patches/0149-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0147-Fix-Corrupted-Trapped-Chest.patch similarity index 100% rename from CraftBukkit-Patches/0149-Fix-Corrupted-Trapped-Chest.patch rename to CraftBukkit-Patches/0147-Fix-Corrupted-Trapped-Chest.patch diff --git a/CraftBukkit-Patches/0150-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch similarity index 100% rename from CraftBukkit-Patches/0150-Remove-uneeded-validation.patch rename to CraftBukkit-Patches/0148-Remove-uneeded-validation.patch diff --git a/CraftBukkit-Patches/0151-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0149-Add-Hunger-Config-Values.patch similarity index 100% rename from CraftBukkit-Patches/0151-Add-Hunger-Config-Values.patch rename to CraftBukkit-Patches/0149-Add-Hunger-Config-Values.patch diff --git a/CraftBukkit-Patches/0152-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0150-Make-debug-logging-togglable.patch similarity index 100% rename from CraftBukkit-Patches/0152-Make-debug-logging-togglable.patch rename to CraftBukkit-Patches/0150-Make-debug-logging-togglable.patch diff --git a/CraftBukkit-Patches/0153-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0151-Skip-invalid-enchants-in-CraftMetaItem.patch similarity index 100% rename from CraftBukkit-Patches/0153-Skip-invalid-enchants-in-CraftMetaItem.patch rename to CraftBukkit-Patches/0151-Skip-invalid-enchants-in-CraftMetaItem.patch diff --git a/CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0152-Limit-TNT-Detonations-per-tick.patch similarity index 98% rename from CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch rename to CraftBukkit-Patches/0152-Limit-TNT-Detonations-per-tick.patch index f79524b9f..c26a9f80e 100644 --- a/CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0152-Limit-TNT-Detonations-per-tick.patch @@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.lastY = this.locY; this.lastZ = this.locZ; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000004 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0155-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch similarity index 100% rename from CraftBukkit-Patches/0155-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch rename to CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch diff --git a/CraftBukkit-Patches/0156-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0154-Configurable-Hanging-Tick.patch similarity index 100% rename from CraftBukkit-Patches/0156-Configurable-Hanging-Tick.patch rename to CraftBukkit-Patches/0154-Configurable-Hanging-Tick.patch diff --git a/CraftBukkit-Patches/0157-Fix-Some-Memory-Leaks.patch b/CraftBukkit-Patches/0155-Fix-Some-Memory-Leaks.patch similarity index 100% rename from CraftBukkit-Patches/0157-Fix-Some-Memory-Leaks.patch rename to CraftBukkit-Patches/0155-Fix-Some-Memory-Leaks.patch diff --git a/CraftBukkit-Patches/0158-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0156-Refactor-ItemDoor-Place.patch similarity index 100% rename from CraftBukkit-Patches/0158-Refactor-ItemDoor-Place.patch rename to CraftBukkit-Patches/0156-Refactor-ItemDoor-Place.patch diff --git a/CraftBukkit-Patches/0159-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch b/CraftBukkit-Patches/0157-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch similarity index 100% rename from CraftBukkit-Patches/0159-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch rename to CraftBukkit-Patches/0157-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch diff --git a/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch new file mode 100644 index 000000000..1bd886e20 --- /dev/null +++ b/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch @@ -0,0 +1,126 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Sat, 13 Dec 2014 13:06:05 +1100 +Subject: [PATCH] BungeeCord Chat API + + +diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java +new file mode 100644 +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 +--- /dev/null ++++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java +@@ -0,0 +0,0 @@ ++package net.minecraft.server; ++ ++public class PacketPlayOutChat implements Packet { ++ ++ private IChatBaseComponent a; ++ public net.md_5.bungee.api.chat.BaseComponent[] components; // Spigot ++ private byte b; ++ ++ public PacketPlayOutChat() {} ++ ++ public PacketPlayOutChat(IChatBaseComponent ichatbasecomponent) { ++ this(ichatbasecomponent, (byte) 1); ++ } ++ ++ public PacketPlayOutChat(IChatBaseComponent ichatbasecomponent, byte b0) { ++ this.a = ichatbasecomponent; ++ this.b = b0; ++ } ++ ++ public void a(PacketDataSerializer packetdataserializer) { ++ this.a = packetdataserializer.d(); ++ this.b = packetdataserializer.readByte(); ++ } ++ ++ public void b(PacketDataSerializer packetdataserializer) { ++ // Spigot start ++ if (components != null) { ++ packetdataserializer.a(net.md_5.bungee.chat.ComponentSerializer.toString(components)); ++ } else { ++ packetdataserializer.a(this.a); ++ } ++ // Spigot end ++ packetdataserializer.writeByte(this.b); ++ } ++ ++ public void a(PacketListenerPlayOut packetlistenerplayout) { ++ packetlistenerplayout.a(this); ++ } ++ ++ public boolean b() { ++ return this.b == 1 || this.b == 2; ++ } ++ ++ public void a(PacketListener packetlistener) { ++ this.a((PacketListenerPlayOut) packetlistener); ++ } ++} +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -0,0 +0,0 @@ import io.netty.buffer.ByteBufOutputStream; + import io.netty.buffer.Unpooled; + import io.netty.handler.codec.base64.Base64; + import jline.console.ConsoleReader; ++import net.md_5.bungee.api.chat.BaseComponent; + + public final class CraftServer implements Server { + private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0]; +@@ -0,0 +0,0 @@ public final class CraftServer implements Server { + { + return org.spigotmc.SpigotConfig.config; + } ++ ++ @Override ++ public void broadcast(BaseComponent component) { ++ for (Player player : getOnlinePlayers()) { ++ player.spigot().sendMessage(component); ++ } ++ } ++ ++ @Override ++ public void broadcast(BaseComponent... components) { ++ for (Player player : getOnlinePlayers()) { ++ player.spigot().sendMessage(components); ++ } ++ } + }; + + public Spigot spigot() +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -0,0 +0,0 @@ import java.util.Set; + import java.util.UUID; + import java.util.logging.Level; + import java.util.logging.Logger; ++import net.md_5.bungee.api.chat.BaseComponent; + + import net.minecraft.server.*; + +@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + + return java.util.Collections.unmodifiableSet( ret ); + } ++ ++ @Override ++ public void sendMessage(BaseComponent component) { ++ sendMessage( new BaseComponent[] { component } ); ++ } ++ ++ @Override ++ public void sendMessage(BaseComponent... components) { ++ if ( getHandle().playerConnection == null ) return; ++ ++ PacketPlayOutChat packet = new PacketPlayOutChat(); ++ packet.components = components; ++ getHandle().playerConnection.sendPacket(packet); ++ } + }; + + public Player.Spigot spigot() +-- \ No newline at end of file