From 8bbab87c6b28bae7dffa6195f9004e16a5944036 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 14 Dec 2014 15:54:10 -0600 Subject: [PATCH] Update from upstream SpigotMC 3e3ea0bd0d8 320ed92779f 612de468951 --- Bukkit-Patches/0031-BungeeCord-Chat-API.patch | 85 ++++++++++++ .../0003-Skeleton-API-Implementations.patch | 6 +- CraftBukkit-Patches/0061-Particle-API.patch | 6 +- ...ng-on-corrupted-map-data-NBT-arrays.patch} | 2 +- ...vanilla-s-direction-tag-on-fireballs.patch | 36 ----- ...-ZombiePigmen-spawning-in-portal-bl.patch} | 2 +- .../0073-Support-non-prefixed-URLs.patch | 41 ------ ... => 0074-Highly-Optimized-Tick-Loop.patch} | 2 +- ...inks.patch => 0075-Add-Spigot-Links.patch} | 2 +- ... 0076-Configurable-Ping-Sample-Size.patch} | 2 +- ...=> 0077-Add-Optional-Tick-Shuffling.patch} | 2 +- ...Allow-Configuring-Chunks-per-Packet.patch} | 4 +- ...Implement-Locale-Getter-for-Players.patch} | 6 +- ...patch => 0080-Cap-Entity-Collisions.patch} | 2 +- ...ne-meal-not-having-the-correct-data.patch} | 2 +- ...atch => 0082-Spam-Filter-Exclusions.patch} | 2 +- ...ion-to-Silence-CommandBlock-Console.patch} | 2 +- ...support-for-fetching-hidden-players.patch} | 4 +- ...llow-Disabling-Creative-Item-Filter.patch} | 2 +- ...h => 0086-Cap-Channel-Registrations.patch} | 4 +- ...mands-to-be-the-main-version-of-a-c.patch} | 4 +- ...the-isDisconnected-method-by-bukkit.patch} | 2 +- ...Implement-Silenceable-Lightning-API.patch} | 8 +- ...missibleBase-for-all-Command-Blocks.patch} | 2 +- ...Prevent-hoppers-from-loading-chunks.patch} | 2 +- ...ist.patch => 0092-Guard-Entity-List.patch} | 2 +- ...ificationException-while-being-idle.patch} | 2 +- ...ncellable-WitherSkull-potion-effect.patch} | 2 +- ...iptive-kick-reasons-instead-of-Nope.patch} | 2 +- ...ragon-death-and-wither-spawn-sounds.patch} | 2 +- ...-client-crashes-server-lists-and-Mo.patch} | 2 +- ...=> 0098-Treat-Bungee-as-Online-Mode.patch} | 2 +- ...atch => 0099-Add-Conversion-Message.patch} | 2 +- ...el-fishing-event.-Fixes-BUKKIT-5396.patch} | 2 +- ...01-Print-Stack-on-InternalException.patch} | 2 +- ...ffline-Player-Data-Once-if-Required.patch} | 2 +- ...se-for-Non-Existent-Offline-Players.patch} | 2 +- ...Check-for-blank-OfflinePlayer-Names.patch} | 2 +- ...ng.patch => 0105-Fix-Player-Banning.patch} | 2 +- ....patch => 0106-Fix-ban-expire-dates.patch} | 2 +- ...atch => 0107-Correct-Ban-Expiration.patch} | 4 +- ...> 0108-Convert-Horses-owner-to-UUID.patch} | 4 +- ...team-API-to-allow-arbitrary-strings.patch} | 2 +- ... => 0110-Add-Score.isScoreSet-Z-API.patch} | 2 +- ...h => 0111-Log-null-TileEntity-Owner.patch} | 2 +- ...al-case-invalid-usernames-for-UUIDs.patch} | 2 +- ...=> 0113-Convert-player-skulls-async.patch} | 4 +- ...sDefError-crash-and-notify-on-crash.patch} | 2 +- ....patch => 0115-Check-Skull-canPlace.patch} | 2 +- ...6-Don-t-let-trees-replace-any-block.patch} | 2 +- ...n-that-could-kill-connections-befor.patch} | 2 +- ... => 0118-Configurable-UserCache-cap.patch} | 2 +- ...-Implement-PlayerSpawnLocationEvent.patch} | 4 +- ... => 0120-Cap-Objective-Score-Length.patch} | 2 +- ...ion-input-on-the-main-thread.-Fixes.patch} | 2 +- ...ble-save-on-stop-only-for-UserCache.patch} | 2 +- ...3-Prevent-Unbounded-IntCache-Growth.patch} | 2 +- ...-Add-damager-to-the-unhandled-error.patch} | 4 +- ...25-Cross-World-Entity-Teleportation.patch} | 2 +- ...block-placement-interaction-packets.patch} | 2 +- ...atch => 0127-Better-item-validation.patch} | 2 +- ... => 0128-Further-Seed-Customisation.patch} | 2 +- ...> 0129-Disable-ResourceLeakDetector.patch} | 4 +- ...-Information-to-session.lock-Errors.patch} | 2 +- ...ng.patch => 0131-Safer-JSON-Loading.patch} | 2 +- ... => 0132-Fix-Slow-Loading-Libraries.patch} | 4 +- ...h => 0133-Add-CommandLine-EULA-Flag.patch} | 2 +- ...g-table-wiping-meta-when-placing-st.patch} | 2 +- ...-ocelots-when-plugins-spawn-ocelots.patch} | 6 +- ...revent-a-crash-involving-attributes.patch} | 4 +- ...ke-moved-wrongly-limit-configurable.patch} | 4 +- ...=> 0138-Fix-Null-Tile-Entity-Worlds.patch} | 2 +- ...oved-too-quickly-limit-configurable.patch} | 4 +- ... => 0140-Alternative-Hopper-Ticking.patch} | 2 +- ...Apply-NBTReadLimiter-to-more-things.patch} | 2 +- ...tch => 0142-Allow-Attribute-Capping.patch} | 2 +- ...-a-global-cache-for-any-request-on-.patch} | 2 +- ...fetch-an-online-UUID-in-online-mode.patch} | 2 +- ...modifiers-which-cause-the-attribute.patch} | 2 +- ...h => 0146-Plug-WorldMap-Memory-Leak.patch} | 2 +- ...=> 0147-Fix-Corrupted-Trapped-Chest.patch} | 4 +- ...h => 0148-Remove-uneeded-validation.patch} | 2 +- ...ch => 0149-Add-Hunger-Config-Values.patch} | 4 +- ...> 0150-Make-debug-logging-togglable.patch} | 2 +- ...p-invalid-enchants-in-CraftMetaItem.patch} | 2 +- ...0152-Limit-TNT-Detonations-per-tick.patch} | 4 +- ...able-and-setUnbreakable-to-ItemMeta.patch} | 2 +- ...h => 0154-Configurable-Hanging-Tick.patch} | 2 +- ...patch => 0155-Fix-Some-Memory-Leaks.patch} | 2 +- ...tch => 0156-Refactor-ItemDoor-Place.patch} | 2 +- ...InventoryCloseEvent-Unless-Required.patch} | 4 +- .../0158-BungeeCord-Chat-API.patch | 128 ++++++++++++++++++ 92 files changed, 330 insertions(+), 194 deletions(-) create mode 100644 Bukkit-Patches/0031-BungeeCord-Chat-API.patch rename CraftBukkit-Patches/{0074-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch => 0072-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch} (95%) delete mode 100644 CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch rename CraftBukkit-Patches/{0075-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch => 0073-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch} (96%) delete mode 100644 CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch rename CraftBukkit-Patches/{0076-Highly-Optimized-Tick-Loop.patch => 0074-Highly-Optimized-Tick-Loop.patch} (99%) rename CraftBukkit-Patches/{0077-Add-Spigot-Links.patch => 0075-Add-Spigot-Links.patch} (98%) rename CraftBukkit-Patches/{0078-Configurable-Ping-Sample-Size.patch => 0076-Configurable-Ping-Sample-Size.patch} (96%) rename CraftBukkit-Patches/{0079-Add-Optional-Tick-Shuffling.patch => 0077-Add-Optional-Tick-Shuffling.patch} (96%) rename CraftBukkit-Patches/{0080-Allow-Configuring-Chunks-per-Packet.patch => 0078-Allow-Configuring-Chunks-per-Packet.patch} (94%) rename CraftBukkit-Patches/{0081-Implement-Locale-Getter-for-Players.patch => 0079-Implement-Locale-Getter-for-Players.patch} (92%) rename CraftBukkit-Patches/{0082-Cap-Entity-Collisions.patch => 0080-Cap-Entity-Collisions.patch} (97%) rename CraftBukkit-Patches/{0083-Fix-dispensing-bone-meal-not-having-the-correct-data.patch => 0081-Fix-dispensing-bone-meal-not-having-the-correct-data.patch} (94%) rename CraftBukkit-Patches/{0084-Spam-Filter-Exclusions.patch => 0082-Spam-Filter-Exclusions.patch} (97%) rename CraftBukkit-Patches/{0085-Add-Option-to-Silence-CommandBlock-Console.patch => 0083-Add-Option-to-Silence-CommandBlock-Console.patch} (95%) rename CraftBukkit-Patches/{0086-Add-support-for-fetching-hidden-players.patch => 0084-Add-support-for-fetching-hidden-players.patch} (91%) rename CraftBukkit-Patches/{0087-Allow-Disabling-Creative-Item-Filter.patch => 0085-Allow-Disabling-Creative-Item-Filter.patch} (96%) rename CraftBukkit-Patches/{0088-Cap-Channel-Registrations.patch => 0086-Cap-Channel-Registrations.patch} (89%) rename CraftBukkit-Patches/{0089-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch => 0087-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch} (97%) rename CraftBukkit-Patches/{0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch => 0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch} (93%) rename CraftBukkit-Patches/{0091-Implement-Silenceable-Lightning-API.patch => 0089-Implement-Silenceable-Lightning-API.patch} (95%) rename CraftBukkit-Patches/{0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch => 0090-Use-one-PermissibleBase-for-all-Command-Blocks.patch} (94%) rename CraftBukkit-Patches/{0093-Prevent-hoppers-from-loading-chunks.patch => 0091-Prevent-hoppers-from-loading-chunks.patch} (93%) rename CraftBukkit-Patches/{0094-Guard-Entity-List.patch => 0092-Guard-Entity-List.patch} (97%) rename CraftBukkit-Patches/{0095-Fix-ConcurrentModificationException-while-being-idle.patch => 0093-Fix-ConcurrentModificationException-while-being-idle.patch} (93%) rename CraftBukkit-Patches/{0096-Cancellable-WitherSkull-potion-effect.patch => 0094-Cancellable-WitherSkull-potion-effect.patch} (96%) rename CraftBukkit-Patches/{0097-Descriptive-kick-reasons-instead-of-Nope.patch => 0095-Descriptive-kick-reasons-instead-of-Nope.patch} (97%) rename CraftBukkit-Patches/{0098-Configurable-dragon-death-and-wither-spawn-sounds.patch => 0096-Configurable-dragon-death-and-wither-spawn-sounds.patch} (97%) rename CraftBukkit-Patches/{0099-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch => 0097-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch} (92%) rename CraftBukkit-Patches/{0100-Treat-Bungee-as-Online-Mode.patch => 0098-Treat-Bungee-as-Online-Mode.patch} (94%) rename CraftBukkit-Patches/{0101-Add-Conversion-Message.patch => 0099-Add-Conversion-Message.patch} (91%) rename CraftBukkit-Patches/{0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch => 0100-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch} (94%) rename CraftBukkit-Patches/{0103-Print-Stack-on-InternalException.patch => 0101-Print-Stack-on-InternalException.patch} (93%) rename CraftBukkit-Patches/{0104-Use-Offline-Player-Data-Once-if-Required.patch => 0102-Use-Offline-Player-Data-Once-if-Required.patch} (96%) rename CraftBukkit-Patches/{0105-Use-Provided-Case-for-Non-Existent-Offline-Players.patch => 0103-Use-Provided-Case-for-Non-Existent-Offline-Players.patch} (92%) rename CraftBukkit-Patches/{0106-Check-for-blank-OfflinePlayer-Names.patch => 0104-Check-for-blank-OfflinePlayer-Names.patch} (93%) rename CraftBukkit-Patches/{0107-Fix-Player-Banning.patch => 0105-Fix-Player-Banning.patch} (96%) rename CraftBukkit-Patches/{0108-Fix-ban-expire-dates.patch => 0106-Fix-ban-expire-dates.patch} (92%) rename CraftBukkit-Patches/{0109-Correct-Ban-Expiration.patch => 0107-Correct-Ban-Expiration.patch} (90%) rename CraftBukkit-Patches/{0110-Convert-Horses-owner-to-UUID.patch => 0108-Convert-Horses-owner-to-UUID.patch} (94%) rename CraftBukkit-Patches/{0111-Expand-team-API-to-allow-arbitrary-strings.patch => 0109-Expand-team-API-to-allow-arbitrary-strings.patch} (98%) rename CraftBukkit-Patches/{0112-Add-Score.isScoreSet-Z-API.patch => 0110-Add-Score.isScoreSet-Z-API.patch} (95%) rename CraftBukkit-Patches/{0113-Log-null-TileEntity-Owner.patch => 0111-Log-null-TileEntity-Owner.patch} (95%) rename CraftBukkit-Patches/{0114-Don-t-special-case-invalid-usernames-for-UUIDs.patch => 0112-Don-t-special-case-invalid-usernames-for-UUIDs.patch} (94%) rename CraftBukkit-Patches/{0115-Convert-player-skulls-async.patch => 0113-Convert-player-skulls-async.patch} (98%) rename CraftBukkit-Patches/{0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch => 0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch} (97%) rename CraftBukkit-Patches/{0117-Check-Skull-canPlace.patch => 0115-Check-Skull-canPlace.patch} (93%) rename CraftBukkit-Patches/{0118-Don-t-let-trees-replace-any-block.patch => 0116-Don-t-let-trees-replace-any-block.patch} (96%) rename CraftBukkit-Patches/{0119-Fix-race-condition-that-could-kill-connections-befor.patch => 0117-Fix-race-condition-that-could-kill-connections-befor.patch} (97%) rename CraftBukkit-Patches/{0120-Configurable-UserCache-cap.patch => 0118-Configurable-UserCache-cap.patch} (95%) rename CraftBukkit-Patches/{0121-Implement-PlayerSpawnLocationEvent.patch => 0119-Implement-PlayerSpawnLocationEvent.patch} (95%) rename CraftBukkit-Patches/{0122-Cap-Objective-Score-Length.patch => 0120-Cap-Objective-Score-Length.patch} (94%) rename CraftBukkit-Patches/{0123-Process-conversation-input-on-the-main-thread.-Fixes.patch => 0121-Process-conversation-input-on-the-main-thread.-Fixes.patch} (95%) rename CraftBukkit-Patches/{0124-Configurable-save-on-stop-only-for-UserCache.patch => 0122-Configurable-save-on-stop-only-for-UserCache.patch} (96%) rename CraftBukkit-Patches/{0125-Prevent-Unbounded-IntCache-Growth.patch => 0123-Prevent-Unbounded-IntCache-Growth.patch} (97%) rename CraftBukkit-Patches/{0126-Add-damager-to-the-unhandled-error.patch => 0124-Add-damager-to-the-unhandled-error.patch} (97%) rename CraftBukkit-Patches/{0127-Cross-World-Entity-Teleportation.patch => 0125-Cross-World-Entity-Teleportation.patch} (95%) rename CraftBukkit-Patches/{0128-Limit-block-placement-interaction-packets.patch => 0126-Limit-block-placement-interaction-packets.patch} (98%) rename CraftBukkit-Patches/{0129-Better-item-validation.patch => 0127-Better-item-validation.patch} (99%) rename CraftBukkit-Patches/{0130-Further-Seed-Customisation.patch => 0128-Further-Seed-Customisation.patch} (97%) rename CraftBukkit-Patches/{0131-Disable-ResourceLeakDetector.patch => 0129-Disable-ResourceLeakDetector.patch} (91%) rename CraftBukkit-Patches/{0132-Add-More-Information-to-session.lock-Errors.patch => 0130-Add-More-Information-to-session.lock-Errors.patch} (96%) rename CraftBukkit-Patches/{0133-Safer-JSON-Loading.patch => 0131-Safer-JSON-Loading.patch} (97%) rename CraftBukkit-Patches/{0134-Fix-Slow-Loading-Libraries.patch => 0132-Fix-Slow-Loading-Libraries.patch} (88%) rename CraftBukkit-Patches/{0135-Add-CommandLine-EULA-Flag.patch => 0133-Add-CommandLine-EULA-Flag.patch} (96%) rename CraftBukkit-Patches/{0136-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch => 0134-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch} (94%) rename CraftBukkit-Patches/{0137-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch => 0135-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch} (92%) rename CraftBukkit-Patches/{0138-Prevent-a-crash-involving-attributes.patch => 0136-Prevent-a-crash-involving-attributes.patch} (93%) rename CraftBukkit-Patches/{0139-Make-moved-wrongly-limit-configurable.patch => 0137-Make-moved-wrongly-limit-configurable.patch} (94%) rename CraftBukkit-Patches/{0140-Fix-Null-Tile-Entity-Worlds.patch => 0138-Fix-Null-Tile-Entity-Worlds.patch} (91%) rename CraftBukkit-Patches/{0141-Make-moved-too-quickly-limit-configurable.patch => 0139-Make-moved-too-quickly-limit-configurable.patch} (95%) rename CraftBukkit-Patches/{0142-Alternative-Hopper-Ticking.patch => 0140-Alternative-Hopper-Ticking.patch} (99%) rename CraftBukkit-Patches/{0143-Apply-NBTReadLimiter-to-more-things.patch => 0141-Apply-NBTReadLimiter-to-more-things.patch} (96%) rename CraftBukkit-Patches/{0144-Allow-Attribute-Capping.patch => 0142-Allow-Attribute-Capping.patch} (98%) rename CraftBukkit-Patches/{0145-Add-an-option-for-a-global-cache-for-any-request-on-.patch => 0143-Add-an-option-for-a-global-cache-for-any-request-on-.patch} (99%) rename CraftBukkit-Patches/{0146-Only-fetch-an-online-UUID-in-online-mode.patch => 0144-Only-fetch-an-online-UUID-in-online-mode.patch} (96%) rename CraftBukkit-Patches/{0147-Filter-attribute-modifiers-which-cause-the-attribute.patch => 0145-Filter-attribute-modifiers-which-cause-the-attribute.patch} (99%) rename CraftBukkit-Patches/{0148-Plug-WorldMap-Memory-Leak.patch => 0146-Plug-WorldMap-Memory-Leak.patch} (97%) rename CraftBukkit-Patches/{0149-Fix-Corrupted-Trapped-Chest.patch => 0147-Fix-Corrupted-Trapped-Chest.patch} (91%) rename CraftBukkit-Patches/{0150-Remove-uneeded-validation.patch => 0148-Remove-uneeded-validation.patch} (95%) rename CraftBukkit-Patches/{0151-Add-Hunger-Config-Values.patch => 0149-Add-Hunger-Config-Values.patch} (97%) rename CraftBukkit-Patches/{0152-Make-debug-logging-togglable.patch => 0150-Make-debug-logging-togglable.patch} (97%) rename CraftBukkit-Patches/{0153-Skip-invalid-enchants-in-CraftMetaItem.patch => 0151-Skip-invalid-enchants-in-CraftMetaItem.patch} (95%) rename CraftBukkit-Patches/{0154-Limit-TNT-Detonations-per-tick.patch => 0152-Limit-TNT-Detonations-per-tick.patch} (95%) rename CraftBukkit-Patches/{0155-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch => 0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch} (98%) rename CraftBukkit-Patches/{0156-Configurable-Hanging-Tick.patch => 0154-Configurable-Hanging-Tick.patch} (96%) rename CraftBukkit-Patches/{0157-Fix-Some-Memory-Leaks.patch => 0155-Fix-Some-Memory-Leaks.patch} (98%) rename CraftBukkit-Patches/{0158-Refactor-ItemDoor-Place.patch => 0156-Refactor-ItemDoor-Place.patch} (95%) rename CraftBukkit-Patches/{0159-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch => 0157-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch} (90%) create mode 100644 CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch diff --git a/Bukkit-Patches/0031-BungeeCord-Chat-API.patch b/Bukkit-Patches/0031-BungeeCord-Chat-API.patch new file mode 100644 index 0000000000..0dd68f68bf --- /dev/null +++ b/Bukkit-Patches/0031-BungeeCord-Chat-API.patch @@ -0,0 +1,85 @@ +From b7b8fcaa806f8debf854aa025282d39936d0f357 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 17f976d..674920b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -118,6 +118,13 @@ + 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 57b2794..cf4ab1d 100644 +--- a/src/main/java/org/bukkit/Server.java ++++ b/src/main/java/org/bukkit/Server.java +@@ -916,6 +916,24 @@ 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 b55d70e..8eb781e 100644 +--- a/src/main/java/org/bukkit/entity/Player.java ++++ b/src/main/java/org/bukkit/entity/Player.java +@@ -1104,6 +1104,24 @@ 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(); +-- +2.1.0 + diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 0b71e038c8..f02c1af996 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From dc7886d3fde174339f15c44078985ec3b795054f Mon Sep 17 00:00:00 2001 +From 49a8359446f3929a0b2ac0de40c59502ddad5a58 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -25,10 +25,10 @@ index b4ad7d1..4c33f5a 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 83efd6a..8d28b9a 100644 +index a7d3e5f..1353c90 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1323,4 +1323,14 @@ public class CraftWorld implements World { +@@ -1309,4 +1309,14 @@ public class CraftWorld implements World { cps.queueUnload(chunk.locX, chunk.locZ); } } diff --git a/CraftBukkit-Patches/0061-Particle-API.patch b/CraftBukkit-Patches/0061-Particle-API.patch index 9623ea6325..14f346d7d9 100644 --- a/CraftBukkit-Patches/0061-Particle-API.patch +++ b/CraftBukkit-Patches/0061-Particle-API.patch @@ -1,4 +1,4 @@ -From 0275b4cfc6008da7830d21bc7e69bbe41a5eeada Mon Sep 17 00:00:00 2001 +From c1960cb2930f4daa7cfa1470b7ff42c0b137f1f4 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -19,7 +19,7 @@ index 7de0de5..13f9e9d 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 568072f..cc6c003 100644 +index 62340d3..6c6284b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -811,28 +811,18 @@ public class CraftWorld implements World { @@ -60,7 +60,7 @@ index 568072f..cc6c003 100644 } public T spawn(Location location, Class clazz) throws IllegalArgumentException { -@@ -1331,6 +1321,70 @@ public class CraftWorld implements World { +@@ -1317,6 +1307,70 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { 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 95% 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 index 7e74237fec..44db17ebb2 100644 --- 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 @@ -1,4 +1,4 @@ -From 376a98c626d952be1ec7c4b0243c54a4f205fb23 Mon Sep 17 00:00:00 2001 +From 27655100f4d2984184b394e5f0d9ce818ce8f2fc Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 20 Jan 2014 13:44:07 +1100 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. 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 0ed6704467..0000000000 --- a/CraftBukkit-Patches/0072-Support-vanilla-s-direction-tag-on-fireballs.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 07704d776ea0fce7002e03adb07994549e61358d 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 31af702..6f2b506 100644 ---- a/src/main/java/net/minecraft/server/EntityFireball.java -+++ b/src/main/java/net/minecraft/server/EntityFireball.java -@@ -200,6 +200,8 @@ 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) { -@@ -221,6 +223,13 @@ 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(); - } --- -2.1.0 - 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 96% 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 index f328d75e29..fc9f6dec3e 100644 --- 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 @@ -1,4 +1,4 @@ -From c39b1e98057b0fa00d788e6da9c6c99e06503763 Mon Sep 17 00:00:00 2001 +From e20825877e73f2888aec875eb3d8f1ab05761c92 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks 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 4fa9c7ea1b..0000000000 --- a/CraftBukkit-Patches/0073-Support-non-prefixed-URLs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fc8066aa363f20a5c37f8789294943d7f56e16a1 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 844bf6a..0481688 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -@@ -19,7 +19,7 @@ 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(); -@@ -89,6 +89,9 @@ 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); -@@ -100,7 +103,7 @@ 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) { --- -2.1.0 - diff --git a/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch similarity index 99% rename from CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch rename to CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch index fd139da0ea..34b40cf8e7 100644 --- a/CraftBukkit-Patches/0076-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch @@ -1,4 +1,4 @@ -From 5ceb8bec0a5b6d0c209c4fec89ca28b86a34ff9e Mon Sep 17 00:00:00 2001 +From 6887a627fa92aa922b3fb517f2d58b62a24c1cef Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/CraftBukkit-Patches/0077-Add-Spigot-Links.patch b/CraftBukkit-Patches/0075-Add-Spigot-Links.patch similarity index 98% rename from CraftBukkit-Patches/0077-Add-Spigot-Links.patch rename to CraftBukkit-Patches/0075-Add-Spigot-Links.patch index a36211af73..2bd4b34eb7 100644 --- a/CraftBukkit-Patches/0077-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0075-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 5bc28242a60cdc16a143b6e711e43dfff9b9b6bd Mon Sep 17 00:00:00 2001 +From 0df7d5b951801131041de43274f655cb7dd6dee6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 23 Jan 2014 13:17:35 +1100 Subject: [PATCH] Add Spigot Links diff --git a/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch similarity index 96% rename from CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch rename to CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch index b085993a17..89e9135dbb 100644 --- a/CraftBukkit-Patches/0078-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From 4577b3294c5d498feae4d28113347212d7a6a5d1 Mon Sep 17 00:00:00 2001 +From 728ce35a754c81c2cd7dfe2effbd67f9375edd50 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 26 Jan 2014 21:48:34 +1100 Subject: [PATCH] Configurable Ping Sample Size diff --git a/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch similarity index 96% rename from CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch rename to CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch index e418ec09d3..df5c38cb01 100644 --- a/CraftBukkit-Patches/0079-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 8c82568bb061577addd20a69f8e3197c593e9c5e Mon Sep 17 00:00:00 2001 +From d831e59598a4dfd26623c6c0abe354f64d73d7e8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 27 Jan 2014 08:39:26 +1100 Subject: [PATCH] Add Optional Tick Shuffling diff --git a/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch similarity index 94% rename from CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch rename to CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch index e731048f51..a1484f0751 100644 --- a/CraftBukkit-Patches/0080-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch @@ -1,11 +1,11 @@ -From c3741d045436029602f6d03b24a376a9bbe92cf7 Mon Sep 17 00:00:00 2001 +From 37e47d5757895e9ec2b1ee1443551792b1652444 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 28 Jan 2014 20:35:35 +1100 Subject: [PATCH] Allow Configuring Chunks per Packet diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d8c8151..5aed971 100644 +index d71a6ae..f2adc82 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -220,7 +220,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch similarity index 92% rename from CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch rename to CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch index b03e8269b3..003af6a95a 100644 --- a/CraftBukkit-Patches/0081-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch @@ -1,11 +1,11 @@ -From 96bd30115104c0b451aa8a27327cca9720d245fe Mon Sep 17 00:00:00 2001 +From 0745f0abfd310c791ef520dded687d7eebaa74c0 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5aed971..e8dab78 100644 +index f2adc82..9e1981f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -18,7 +18,7 @@ index 5aed971..e8dab78 100644 public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ee4289d..3c2c3cc 100644 +index 772f85b..9ce0b2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1400,6 +1400,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch similarity index 97% rename from CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch rename to CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch index a7f6dea0f1..219d9da943 100644 --- a/CraftBukkit-Patches/0082-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From d80d05b09d60f8a1356996dcb560b07a1ac1867b Mon Sep 17 00:00:00 2001 +From 5ba9ee71a20b905f74ec07e19bfc8161a0551b89 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions 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 94% 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 index a79746276a..41ed8d14ae 100644 --- 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 @@ -1,4 +1,4 @@ -From 1f36a4752012204a8bffd4232cac0991ad1a4a38 Mon Sep 17 00:00:00 2001 +From 149bd7d10ec2f6cb9d7d7dcc3be9d3fcb9f1aba8 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 6 Feb 2014 21:59:20 +0000 Subject: [PATCH] Fix dispensing bone meal not having the correct data value diff --git a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch similarity index 97% rename from CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch rename to CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch index fff8548911..8d6466fd82 100644 --- a/CraftBukkit-Patches/0084-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From 9effba200f83e9154741bcf1311914d38acb3f68 Mon Sep 17 00:00:00 2001 +From 9b45bc22d574c989261a1116192e793ca5434d9a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 8 Feb 2014 08:13:40 +0000 Subject: [PATCH] Spam Filter Exclusions 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 95% rename from CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch rename to CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch index a1fee7db68..6e6fdc1c0a 100644 --- a/CraftBukkit-Patches/0085-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 5c461033875ead74b7ef1c83e6d6bc3e3938e347 Mon Sep 17 00:00:00 2001 +From 81b2c29859360cec4484e2c8b6b6534bdfdd4c83 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 9 Feb 2014 14:39:01 +1100 Subject: [PATCH] Add Option to Silence CommandBlock Console 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 91% rename from CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch rename to CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch index 9ac6ee3179..15dc91ecb6 100644 --- a/CraftBukkit-Patches/0086-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch @@ -1,11 +1,11 @@ -From 37aa0f5a81539bf9f4f8a3e49c6fa9a2f94d7898 Mon Sep 17 00:00:00 2001 +From 62573a7e6dae797956a1e43a78c57fcd93bd7c09 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3c2c3cc..b28ec72 100644 +index 9ce0b2c..025bae0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1406,6 +1406,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch similarity index 96% rename from CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch rename to CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch index 26b0941514..4fe3ff50c4 100644 --- a/CraftBukkit-Patches/0087-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch @@ -1,4 +1,4 @@ -From 747cc64e39ce11f96da45d416f1c295faa96c062 Mon Sep 17 00:00:00 2001 +From b893f1d27b493347a6ad8534084ea2faa184f340 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter diff --git a/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch similarity index 89% rename from CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch rename to CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch index 2cecc98ccf..fc60c8b021 100644 --- a/CraftBukkit-Patches/0088-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch @@ -1,11 +1,11 @@ -From 1a3cc56937c40ebe7fe5e3eb4e5651926df75895 Mon Sep 17 00:00:00 2001 +From dd50c6bd40232a7f970f235cabd621276dfdfe9c Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b28ec72..5480607 100644 +index 025bae0..fa357a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1060,6 +1060,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { 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 97% 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 index cd1b310b7a..35fbde0ca1 100644 --- 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 @@ -1,11 +1,11 @@ -From 76e657bb3daaf6b9eb389359a4efff083b37ba9d Mon Sep 17 00:00:00 2001 +From c9789177a44752e12caef0666de8d4ee3a858574 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a5499a1..5fc0e28 100644 +index 5c1cfaa..6ea7371 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -316,8 +316,11 @@ public final class CraftServer implements Server { 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 93% rename from CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch rename to CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 8d3993de08..9a9baffe03 100644 --- a/CraftBukkit-Patches/0090-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From f0f17b0b2d63657ccda01f0264b204842c133bac Mon Sep 17 00:00:00 2001 +From 502954851585fb2880fb90335f2c348d89768de1 Mon Sep 17 00:00:00 2001 From: hcherndon Date: Sat, 15 Feb 2014 01:51:20 -0600 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. diff --git a/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch similarity index 95% rename from CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch rename to CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch index e134ed1308..4fd4e5f985 100644 --- a/CraftBukkit-Patches/0091-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From fe41f463af26484364345384b92b29aa6a18cb79 Mon Sep 17 00:00:00 2001 +From bfda28449544f285799ef6200a7430b7912fd136 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -39,10 +39,10 @@ index 5bda5d3..1bbce9b 100644 //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + 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 d61c1de..2322a96 100644 +index c16f014..67c608a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1390,6 +1390,22 @@ public class CraftWorld implements World { +@@ -1376,6 +1376,22 @@ public class CraftWorld implements World { { CraftWorld.this.playEffect( location, effect, 0 ); } @@ -82,5 +82,5 @@ index 243e8e5..0bacc83 100644 @Override -- -1.9.1 +2.1.0 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 94% 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 index a9fca83368..b9a5e37bb7 100644 --- a/CraftBukkit-Patches/0092-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0090-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 0b5adb4006976878c7a02dafb0ca526d7f1345e6 Mon Sep 17 00:00:00 2001 +From a732e34d7a1dba29fa40f4ead00b7d6f8e6be456 Mon Sep 17 00:00:00 2001 From: FrozenBrain Date: Sun, 2 Mar 2014 21:13:46 +0100 Subject: [PATCH] Use one PermissibleBase for all Command Blocks diff --git a/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch similarity index 93% rename from CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch rename to CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch index ec5ce267b8..105a76ebc8 100644 --- a/CraftBukkit-Patches/0093-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From f8af922bed5a2a888eaa3f9277f901902095242b Mon Sep 17 00:00:00 2001 +From bad0dbe507dbc8dbfda4879816989a599c2a6683 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 5 Mar 2014 20:27:27 +0000 Subject: [PATCH] Prevent hoppers from loading chunks diff --git a/CraftBukkit-Patches/0094-Guard-Entity-List.patch b/CraftBukkit-Patches/0092-Guard-Entity-List.patch similarity index 97% rename from CraftBukkit-Patches/0094-Guard-Entity-List.patch rename to CraftBukkit-Patches/0092-Guard-Entity-List.patch index a45df7ad69..391e7aadd7 100644 --- a/CraftBukkit-Patches/0094-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0092-Guard-Entity-List.patch @@ -1,4 +1,4 @@ -From 95eac1a2131a07f4e646b0b8125bf2bf9b847859 Mon Sep 17 00:00:00 2001 +From 09dc22161de34fb3ad68775cee8e6b7a0509f733 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 09:03:28 +1100 Subject: [PATCH] Guard Entity List diff --git a/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch similarity index 93% rename from CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch rename to CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch index dec75b88fd..4f81b5b3a8 100644 --- a/CraftBukkit-Patches/0095-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 31ece3ba767483b20a8bdcb00575610aff2f84f1 Mon Sep 17 00:00:00 2001 +From 29b1e53fa40fbf82cb6f7eba59b0061dda85fd48 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch similarity index 96% rename from CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch rename to CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch index 70022aac13..a1758505ba 100644 --- a/CraftBukkit-Patches/0096-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 2f9302529541e21254ecb789ba18f5d8b086740a Mon Sep 17 00:00:00 2001 +From 15ac5dac8060210ffca02c9d4ceabfdc01d529b3 Mon Sep 17 00:00:00 2001 From: drXor Date: Tue, 25 Feb 2014 15:15:26 -0400 Subject: [PATCH] Cancellable WitherSkull potion effect 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 97% rename from CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch rename to CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch index 9bd9895c6e..7dfd8b3fee 100644 --- a/CraftBukkit-Patches/0097-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 99c9a03e1bfae144c9227a0eae7ef8f0d57c0181 Mon Sep 17 00:00:00 2001 +From 918f37af751b8e4818e8c70efd4535ecbd691171 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! 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 97% 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 index 6e24d134dc..09ebdb1912 100644 --- a/CraftBukkit-Patches/0098-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0096-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 058986f4916b16d6a9782c11a4e65c6fb728f38e Mon Sep 17 00:00:00 2001 +From 02aa3cbee16d3fbe91cfa49efccc90fa45e15a07 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds 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 92% 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 index 43a7c18fa0..81e2047e75 100644 --- 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 @@ -1,4 +1,4 @@ -From f5b02414cfef75e2bed71ec2e4cf2a06f58141b5 Mon Sep 17 00:00:00 2001 +From d9fe305bd03e60a8fa9719a3ce784d660363fb42 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch similarity index 94% rename from CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch rename to CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch index b9710f6a36..d5a09cdd9f 100644 --- a/CraftBukkit-Patches/0100-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From 3ef3940c97e509ea36aba015fa9ae06fb6a5816b Mon Sep 17 00:00:00 2001 +From 12aa2aafafaf0d1563f7c5c1c2d8e01101db9f03 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 21:23:58 +1000 Subject: [PATCH] Treat Bungee as Online Mode diff --git a/CraftBukkit-Patches/0101-Add-Conversion-Message.patch b/CraftBukkit-Patches/0099-Add-Conversion-Message.patch similarity index 91% rename from CraftBukkit-Patches/0101-Add-Conversion-Message.patch rename to CraftBukkit-Patches/0099-Add-Conversion-Message.patch index 0a261302fd..7c02374779 100644 --- a/CraftBukkit-Patches/0101-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0099-Add-Conversion-Message.patch @@ -1,4 +1,4 @@ -From 6439f109829d49df5f1333f902f106fb825da0ac Mon Sep 17 00:00:00 2001 +From fa0d38a128ada28b2c636cdf94a489738534e3a1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Apr 2014 23:30:44 +1000 Subject: [PATCH] Add Conversion Message 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 94% 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 index acaff4f6c8..475d46e90d 100644 --- a/CraftBukkit-Patches/0102-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0100-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From dd287f8fcf8890ca9fcb4d6f63910f6796598a55 Mon Sep 17 00:00:00 2001 +From 0e1e10059efc10abe646d43417d3cc81e88ead59 Mon Sep 17 00:00:00 2001 From: "gjmcferrin@gmail.com" Date: Mon, 10 Feb 2014 10:05:11 -0500 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396 diff --git a/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch similarity index 93% rename from CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch rename to CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch index 73f619c6f5..b899834939 100644 --- a/CraftBukkit-Patches/0103-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From 194512f5111d68e86abf4576085ef117b21a60e1 Mon Sep 17 00:00:00 2001 +From 29f6da7ad36670417ddd227477b0cce465c62a48 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 09:00:59 +1000 Subject: [PATCH] Print Stack on InternalException 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 96% 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 index 1383dcdf59..9a99509481 100644 --- a/CraftBukkit-Patches/0104-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0102-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 7ec105c3413b800da05393ab7a8cbdd3371f23e7 Mon Sep 17 00:00:00 2001 +From 133e3ad80ca4409eb4b5c6ab9db809f46a12e8af Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 13 Apr 2014 14:41:23 +1000 Subject: [PATCH] Use Offline Player Data Once if Required. 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 92% 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 index bfca50b739..8c7f02a58d 100644 --- 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 @@ -1,4 +1,4 @@ -From b45417ba03a2fcdcb4715c1d1621b33c97755f3a Mon Sep 17 00:00:00 2001 +From e75ede87d59fbe9976d2917a4660939271862e48 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 09:46:20 +1000 Subject: [PATCH] Use Provided Case for Non Existent Offline Players diff --git a/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch similarity index 93% rename from CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch rename to CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch index 40c1feb170..3e5a193ec4 100644 --- a/CraftBukkit-Patches/0106-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From caf26ee83d97c36f4985c62cde9b5e78d1a2d99f Mon Sep 17 00:00:00 2001 +From 9e9b1f786d208c82d01c35112630880824c9f8ab Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 17:21:24 +1000 Subject: [PATCH] Check for blank OfflinePlayer Names diff --git a/CraftBukkit-Patches/0107-Fix-Player-Banning.patch b/CraftBukkit-Patches/0105-Fix-Player-Banning.patch similarity index 96% rename from CraftBukkit-Patches/0107-Fix-Player-Banning.patch rename to CraftBukkit-Patches/0105-Fix-Player-Banning.patch index a2e9bd54c4..88ba84be2d 100644 --- a/CraftBukkit-Patches/0107-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0105-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From cebe57f8332d43c0da78e8dd987818932315232d Mon Sep 17 00:00:00 2001 +From 83ac0ada45001952bf251678184ab4139a0d926e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:32:48 +1000 Subject: [PATCH] Fix Player Banning diff --git a/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch similarity index 92% rename from CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch rename to CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch index 97064ee841..8b07717ad6 100644 --- a/CraftBukkit-Patches/0108-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From 7e0e2dfd75e5e36659d206ad7bf898d903c567af Mon Sep 17 00:00:00 2001 +From a86bde47c59e5af48e8d2374d98acece8f4493b7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 10:09:56 +1000 Subject: [PATCH] Fix ban expire dates. diff --git a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch similarity index 90% rename from CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch rename to CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch index 64cd3b8917..f339b74040 100644 --- a/CraftBukkit-Patches/0109-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch @@ -1,11 +1,11 @@ -From a12d6ee8c2c4b41cc287f1a70803039bd946c313 Mon Sep 17 00:00:00 2001 +From e32eff1d445c6533ef44947d18dd44721b41cd8c Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Apr 2014 11:14:38 +1000 Subject: [PATCH] Correct Ban Expiration diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f0d1ada..82dd862 100644 +index fdb4b3c..7eb2077 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -376,7 +376,7 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch similarity index 94% rename from CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch rename to CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch index 589ce91ecc..26831629e7 100644 --- a/CraftBukkit-Patches/0110-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From 125ef0300ef92639807b91346c45d8d15524880b Mon Sep 17 00:00:00 2001 +From cfb27e0b01901037c45ac152b958c96aa504f1de Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 Apr 2014 01:40:30 -0400 Subject: [PATCH] Convert Horses owner to UUID @@ -27,5 +27,5 @@ index b3ad7e7..50e9292 100644 s = NameReferencingFileConverter.a(s1); } -- -1.9.1 +2.1.0 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 98% 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 index adc280a28c..d5b7067fe7 100644 --- a/CraftBukkit-Patches/0111-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From af4cca3fdb0ff0af9e22638500b9cf24f39d6f9c Mon Sep 17 00:00:00 2001 +From ff3f4662ca0f5ce3b27b59287ed6bd398a3d4bf5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:22:22 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch similarity index 95% rename from CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch rename to CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch index 3cb085d0d7..c5a81c1356 100644 --- a/CraftBukkit-Patches/0112-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From 127d0ce6119ec93e148c623942ce97fb3bafa33e Mon Sep 17 00:00:00 2001 +From 682feeb6afb6995358d04bfc5a3c992a8bbbd44d Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:53 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch similarity index 95% rename from CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch rename to CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch index de9d6628d4..ab58deddec 100644 --- a/CraftBukkit-Patches/0113-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From 53fd961aebd1c269c92d4617c3ec81825e26f3cf Mon Sep 17 00:00:00 2001 +From ab3db2ca053ac821872d0afe0ca41c1e30d3ad1d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 11:16:54 +1000 Subject: [PATCH] Log null TileEntity Owner 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 94% 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 index dbac05b4d7..c58998d1d5 100644 --- 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 @@ -1,4 +1,4 @@ -From 57caebbf7c48ff8546e7933ea900bf126c26a421 Mon Sep 17 00:00:00 2001 +From 96ff9505e65ddb0b27ebcede0c9e7a99e8f52217 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 18:58:00 +1000 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs. diff --git a/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch similarity index 98% rename from CraftBukkit-Patches/0115-Convert-player-skulls-async.patch rename to CraftBukkit-Patches/0113-Convert-player-skulls-async.patch index 376477c3e6..04d7efd5ec 100644 --- a/CraftBukkit-Patches/0115-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From a2bf85035fac8dc52b525d34579a57704bd9fa09 Mon Sep 17 00:00:00 2001 +From 55d7241df41f40ad6a70d8d28a09382fdaf3f4e0 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 20 Apr 2014 13:18:55 +0100 Subject: [PATCH] Convert player skulls async @@ -185,7 +185,7 @@ index 889ae50..6c33c2d 100644 public int getSkullType() { return this.a; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 1d30e5e..e84f24c 100644 +index 89912bc..848a6f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -45,13 +45,27 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { 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 97% 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 index 79117b5bcb..86521785ef 100644 --- a/CraftBukkit-Patches/0116-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,4 +1,4 @@ -From 8debbd894791191ca811c1ca5b1627e43ff94da6 Mon Sep 17 00:00:00 2001 +From 93a239b4ff5a7f7bb86c5f23675f431a5d869c99 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0115-Check-Skull-canPlace.patch similarity index 93% rename from CraftBukkit-Patches/0117-Check-Skull-canPlace.patch rename to CraftBukkit-Patches/0115-Check-Skull-canPlace.patch index 48911020d8..a2c5ab6cd3 100644 --- a/CraftBukkit-Patches/0117-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0115-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 56989d31da36775b31523b8aeaf811262bcef094 Mon Sep 17 00:00:00 2001 +From a36cfad1422c561877cfd493547457f0bfc56951 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:48:35 +1000 Subject: [PATCH] Check Skull canPlace 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 96% 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 index c0713f0971..1c3c0a5b35 100644 --- a/CraftBukkit-Patches/0118-Don-t-let-trees-replace-any-block.patch +++ b/CraftBukkit-Patches/0116-Don-t-let-trees-replace-any-block.patch @@ -1,4 +1,4 @@ -From 614ea6fac94e4fa3d2e901bbf41c81907347fe47 Mon Sep 17 00:00:00 2001 +From e72576b1dd836ea1cea62670df74ad4d946a1d9a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 20 Jan 2014 20:42:28 +0000 Subject: [PATCH] Don't let trees replace any block. 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 97% 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 index 90b56af2f7..b16d6679e4 100644 --- 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 @@ -1,4 +1,4 @@ -From 3b15cce121285a0a63220940aa09ba145ba79504 Mon Sep 17 00:00:00 2001 +From b7af3a1056371a6fe2d758005584177bf12f710f Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 25 Apr 2014 23:46:46 +0200 Subject: [PATCH] Fix race condition that could kill connections before they diff --git a/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0118-Configurable-UserCache-cap.patch similarity index 95% rename from CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch rename to CraftBukkit-Patches/0118-Configurable-UserCache-cap.patch index eb25758f8d..b3436e1ca4 100644 --- a/CraftBukkit-Patches/0120-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0118-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From 7ca132b491e99801dd2338c9879afdae06b3af3f Mon Sep 17 00:00:00 2001 +From dec59b7045056f46cedacfefa959b4cff4cb1ea6 Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 25 Apr 2014 18:17:30 -0400 Subject: [PATCH] Configurable UserCache cap diff --git a/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0119-Implement-PlayerSpawnLocationEvent.patch similarity index 95% rename from CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch rename to CraftBukkit-Patches/0119-Implement-PlayerSpawnLocationEvent.patch index b4d853c46e..bcec1d23c8 100644 --- a/CraftBukkit-Patches/0121-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0119-Implement-PlayerSpawnLocationEvent.patch @@ -1,11 +1,11 @@ -From a8a8ff64e451fbc06f035c5dbe37755bf9620c6f Mon Sep 17 00:00:00 2001 +From 6a92bdedc0b5836044e6e52a1e3f10231bb052ee Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:05:19 +0200 Subject: [PATCH] Implement PlayerSpawnLocationEvent. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 82dd862..34ee440 100644 +index 7eb2077..3fabad4 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -36,6 +36,7 @@ import org.bukkit.event.player.PlayerQuitEvent; diff --git a/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0120-Cap-Objective-Score-Length.patch similarity index 94% rename from CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch rename to CraftBukkit-Patches/0120-Cap-Objective-Score-Length.patch index 627a293776..e627e59b11 100644 --- a/CraftBukkit-Patches/0122-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0120-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From 1d7b2b965435427e441c24abdb23fc18979c2a15 Mon Sep 17 00:00:00 2001 +From 12e61347866917c0643e0bb440120d6925c6db64 Mon Sep 17 00:00:00 2001 From: hauno Date: Tue, 6 May 2014 18:01:37 -0700 Subject: [PATCH] Cap Objective Score Length 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 95% 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 index dfacce1788..8116f09c5b 100644 --- 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 @@ -1,4 +1,4 @@ -From d7364b8b8dabbb570b85867c3b940903d21136ef Mon Sep 17 00:00:00 2001 +From 0bcaa9efb67472fa6e45bc920d123e1b5dfdf6e3 Mon Sep 17 00:00:00 2001 From: riking Date: Wed, 14 May 2014 13:46:48 -0700 Subject: [PATCH] Process conversation input on the main thread. Fixes 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 96% 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 index 0727063e5c..4852dd7115 100644 --- a/CraftBukkit-Patches/0124-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0122-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,4 +1,4 @@ -From 3ce8d2cb840f6b427b34c1eb5b14157d5c692b91 Mon Sep 17 00:00:00 2001 +From 5eac7a493a7bf835399fbf0bbf3cd28dee1502ad Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 23 May 2014 18:05:10 -0400 Subject: [PATCH] Configurable save-on-stop-only for UserCache diff --git a/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0123-Prevent-Unbounded-IntCache-Growth.patch similarity index 97% rename from CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch rename to CraftBukkit-Patches/0123-Prevent-Unbounded-IntCache-Growth.patch index 7b41077045..1357cd64c7 100644 --- a/CraftBukkit-Patches/0125-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0123-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From c73ddaa7d7bcd47fa46a513343b34e2d624d4c06 Mon Sep 17 00:00:00 2001 +From c95d102fb0d2b94a3042f984abde4a4af1c0b8bd Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Jun 2014 19:40:00 +1000 Subject: [PATCH] Prevent Unbounded IntCache Growth 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 97% rename from CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch rename to CraftBukkit-Patches/0124-Add-damager-to-the-unhandled-error.patch index fd2e713b2e..48f9495902 100644 --- a/CraftBukkit-Patches/0126-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0124-Add-damager-to-the-unhandled-error.patch @@ -1,11 +1,11 @@ -From f436dce04a87722898533c5fe78cefcd00e3bad4 Mon Sep 17 00:00:00 2001 +From cde8ba69e0dd1cea070f9ae80fc02639f8250a75 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Jun 2014 23:42:52 +0100 Subject: [PATCH] Add damager to the unhandled error diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 982e45c..2f3ff86 100644 +index 96c7344..74e0930 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -184,7 +184,7 @@ public class CraftEventFactory { diff --git a/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0125-Cross-World-Entity-Teleportation.patch similarity index 95% rename from CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch rename to CraftBukkit-Patches/0125-Cross-World-Entity-Teleportation.patch index 6e7dd6a61a..9ded9a510c 100644 --- a/CraftBukkit-Patches/0127-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0125-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From acb38c2604b45df232ba1a71db38acb806268ee7 Mon Sep 17 00:00:00 2001 +From 0525821cb3704d4e1cf3e7feaf581eecc89d8da5 Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Tue, 24 Dec 2013 07:55:23 -0800 Subject: [PATCH] Cross World Entity Teleportation diff --git a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0126-Limit-block-placement-interaction-packets.patch similarity index 98% rename from CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch rename to CraftBukkit-Patches/0126-Limit-block-placement-interaction-packets.patch index fdfc081fd3..8502b21a5d 100644 --- a/CraftBukkit-Patches/0128-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0126-Limit-block-placement-interaction-packets.patch @@ -1,4 +1,4 @@ -From 809c0879c594cde6164d9614324493204ef4a700 Mon Sep 17 00:00:00 2001 +From 81f80c7cbd36b7974b0ca1d29c1986e4dcc63511 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 29 Jun 2014 21:10:34 +0100 Subject: [PATCH] Limit block placement/interaction packets diff --git a/CraftBukkit-Patches/0129-Better-item-validation.patch b/CraftBukkit-Patches/0127-Better-item-validation.patch similarity index 99% rename from CraftBukkit-Patches/0129-Better-item-validation.patch rename to CraftBukkit-Patches/0127-Better-item-validation.patch index cd297690b6..8ceacf64f6 100644 --- a/CraftBukkit-Patches/0129-Better-item-validation.patch +++ b/CraftBukkit-Patches/0127-Better-item-validation.patch @@ -1,4 +1,4 @@ -From ef07b1f5de9476274a7a491bd59ac0a21948fd24 Mon Sep 17 00:00:00 2001 +From 75cd54caa903d7a3dbf681ddd2043f7c8e3a9320 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 2 Jul 2014 23:35:51 +0100 Subject: [PATCH] Better item validation diff --git a/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0128-Further-Seed-Customisation.patch similarity index 97% rename from CraftBukkit-Patches/0130-Further-Seed-Customisation.patch rename to CraftBukkit-Patches/0128-Further-Seed-Customisation.patch index e04632a9c8..683d834ece 100644 --- a/CraftBukkit-Patches/0130-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0128-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From e58fbbf29dd242c7977aa6ea455adf7371bbba29 Mon Sep 17 00:00:00 2001 +From 9c94e24714c178f5497b0cf0097da5934f8fe761 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation diff --git a/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0129-Disable-ResourceLeakDetector.patch similarity index 91% rename from CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch rename to CraftBukkit-Patches/0129-Disable-ResourceLeakDetector.patch index 6bfd54d34b..77958a1117 100644 --- a/CraftBukkit-Patches/0131-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0129-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From e2d5da82f26b1bcb5f8ebf9a977f52c7da4ef2ff Mon Sep 17 00:00:00 2001 +From 838a7bbd3a436fc108379948f4a0fea962d26d39 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 09:01:50 +1000 Subject: [PATCH] Disable ResourceLeakDetector @@ -6,7 +6,7 @@ Subject: [PATCH] Disable ResourceLeakDetector Hopefully no plugins are somehow leaking buffers, but disabling the ResourceLeakDetector is a good thing for performance of the Netty IO subsytem (it's been disabled in BungeeCord for a while now). diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 28c91cd..0c02747 100644 +index f13be48..5736d88 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -126,6 +126,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs 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 96% 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 index ea411f59ca..c6748ba583 100644 --- a/CraftBukkit-Patches/0132-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0130-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From 0c830ff1ed96046b3eeb471c8bc499dcd9be0e1b Mon Sep 17 00:00:00 2001 +From 0469051a7a3f7d3349622f0ceda6b1e7efb550dd Mon Sep 17 00:00:00 2001 From: Suddenly Date: Sat, 5 Jul 2014 16:56:44 +0100 Subject: [PATCH] Add More Information to session.lock Errors diff --git a/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0131-Safer-JSON-Loading.patch similarity index 97% rename from CraftBukkit-Patches/0133-Safer-JSON-Loading.patch rename to CraftBukkit-Patches/0131-Safer-JSON-Loading.patch index 99bcc9b9f6..f039e1f01d 100644 --- a/CraftBukkit-Patches/0133-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0131-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From f3edd8e4f0b1fb7cec4651daf41dd10e47822208 Mon Sep 17 00:00:00 2001 +From 060d619089731464443c7959814b9e2990a9bc6b Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading diff --git a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0132-Fix-Slow-Loading-Libraries.patch similarity index 88% rename from CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch rename to CraftBukkit-Patches/0132-Fix-Slow-Loading-Libraries.patch index 2739a0aed7..4022a87253 100644 --- a/CraftBukkit-Patches/0134-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0132-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From dc9b26361326393f57a292c0d99070a40f1f790d Mon Sep 17 00:00:00 2001 +From 35298e367c3730226e65de2375b6100c778b2490 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 8 Jul 2014 20:27:52 +1000 Subject: [PATCH] Fix Slow "Loading Libraries" @@ -16,5 +16,5 @@ index 36eff85..08d68aa 100644 -- -1.9.4.msysgit.2 +2.1.0 diff --git a/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0133-Add-CommandLine-EULA-Flag.patch similarity index 96% rename from CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch rename to CraftBukkit-Patches/0133-Add-CommandLine-EULA-Flag.patch index f601444d6c..19c872c239 100644 --- a/CraftBukkit-Patches/0135-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0133-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From 79775244d438c9a01ec9fb4ba2e66a8e65c9de27 Mon Sep 17 00:00:00 2001 +From 938fbc611cf728f3f49f6d696034d9c3fd1b9bf9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 9 Jul 2014 10:35:44 +1000 Subject: [PATCH] Add CommandLine EULA Flag 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 94% 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 index a98d0c4eea..f43d443c0e 100644 --- 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 @@ -1,4 +1,4 @@ -From 0c25a0a897497ccfd8379facda3ef6ca1a3d30ac Mon Sep 17 00:00:00 2001 +From 20814393130106e66649a381e88b050f064b63c7 Mon Sep 17 00:00:00 2001 From: drXor Date: Thu, 17 Jul 2014 21:13:15 -0400 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked 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 92% 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 index 561269cad4..b180290819 100644 --- 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 @@ -1,4 +1,4 @@ -From 7a40b9cd24db374ee1139d61ac092f7e559aec18 Mon Sep 17 00:00:00 2001 +From 4a4de9f1077b4da1b2e2f63fd4db574d6fc40265 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots @@ -26,10 +26,10 @@ index a6b72d8..0f5d09b 100644 EntityOcelot entityocelot = new EntityOcelot(this.world); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 69cb88d..2f34a01 100644 +index 67c608a..ae6efcb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1071,6 +1071,12 @@ public class CraftWorld implements World { +@@ -1057,6 +1057,12 @@ public class CraftWorld implements World { } if (entity != null) { diff --git a/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch similarity index 93% rename from CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch rename to CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch index cc48c6a185..152f41a69a 100644 --- a/CraftBukkit-Patches/0138-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch @@ -1,11 +1,11 @@ -From a19334167ae4751278c8d15b3f55027e25b5db46 Mon Sep 17 00:00:00 2001 +From 967eec7b6d0f5284862f1cb9c71bed17896390bf Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 19:54:41 +0100 Subject: [PATCH] Prevent a crash involving attributes diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5480607..d1f69dc 100644 +index fa357a0..8700b18 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1310,7 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0137-Make-moved-wrongly-limit-configurable.patch similarity index 94% rename from CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch rename to CraftBukkit-Patches/0137-Make-moved-wrongly-limit-configurable.patch index 8fb127a645..8c1a5cea28 100644 --- a/CraftBukkit-Patches/0139-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0137-Make-moved-wrongly-limit-configurable.patch @@ -1,11 +1,11 @@ -From 3295048f09613aac6d7cafe007e8304c2271afe7 Mon Sep 17 00:00:00 2001 +From e0fba81d4849f027d7399e4685e29d95e48bb0d6 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 4 Jul 2014 23:03:13 +0200 Subject: [PATCH] Make "moved wrongly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b266f6a..73477ee 100644 +index 2fa99b3..4fe4d23 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -406,7 +406,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0138-Fix-Null-Tile-Entity-Worlds.patch similarity index 91% rename from CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0138-Fix-Null-Tile-Entity-Worlds.patch index 1f6f40318a..cc2f17bbd9 100644 --- a/CraftBukkit-Patches/0140-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0138-Fix-Null-Tile-Entity-Worlds.patch @@ -1,4 +1,4 @@ -From f3a54462ee2f5638daa4c1d62e6818db1584d6bb Mon Sep 17 00:00:00 2001 +From 1a24fd65242eda3cca0b162d07dc5b1c2e56b51a Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds 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 95% rename from CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch rename to CraftBukkit-Patches/0139-Make-moved-too-quickly-limit-configurable.patch index 589b8e85d0..184cf95b8f 100644 --- a/CraftBukkit-Patches/0141-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0139-Make-moved-too-quickly-limit-configurable.patch @@ -1,11 +1,11 @@ -From 453d7cec49ec898286b82e4d4467ffb8d733bea8 Mon Sep 17 00:00:00 2001 +From 33bf0b52af3030f0b2e7d13fe8d9f052bb4b3860 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 22 Jul 2014 15:59:01 +0200 Subject: [PATCH] Make "moved too quickly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 73477ee..abcb3cd 100644 +index 4fe4d23..c52f393 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -379,7 +379,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch b/CraftBukkit-Patches/0140-Alternative-Hopper-Ticking.patch similarity index 99% rename from CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch rename to CraftBukkit-Patches/0140-Alternative-Hopper-Ticking.patch index d763465944..b31fb378ef 100644 --- a/CraftBukkit-Patches/0142-Alternative-Hopper-Ticking.patch +++ b/CraftBukkit-Patches/0140-Alternative-Hopper-Ticking.patch @@ -1,4 +1,4 @@ -From cc94cf5d70dccd9b10203df3f4745b28527622e4 Mon Sep 17 00:00:00 2001 +From d56c9790772e186672a6396dfdfe7a7441f8d7a0 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Sat, 19 Apr 2014 16:58:26 -0400 Subject: [PATCH] Alternative Hopper Ticking diff --git a/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0141-Apply-NBTReadLimiter-to-more-things.patch similarity index 96% rename from CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch rename to CraftBukkit-Patches/0141-Apply-NBTReadLimiter-to-more-things.patch index 82d5ce2354..ce24f4751a 100644 --- a/CraftBukkit-Patches/0143-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0141-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From 1ae1dcab1312a51a4975680980d63f3f9f2d9026 Mon Sep 17 00:00:00 2001 +From 1aba914e84493f741335d8022c220906f9bff90d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Jul 2014 20:46:04 +1000 Subject: [PATCH] Apply NBTReadLimiter to more things. diff --git a/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0142-Allow-Attribute-Capping.patch similarity index 98% rename from CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch rename to CraftBukkit-Patches/0142-Allow-Attribute-Capping.patch index 16982988fe..1ce4795cba 100644 --- a/CraftBukkit-Patches/0144-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0142-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From ecf4815c1b72c3c3821e0512fe2aadffb68f9c3a Mon Sep 17 00:00:00 2001 +From 398a8e7d7a6b9d5d5542651668208d0260d1e0e8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. 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 99% 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 index 85e1768ea9..e8d16ac17c 100644 --- 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 @@ -1,4 +1,4 @@ -From 94299797492bfd4863ea90793fd5e1deb0576323 Mon Sep 17 00:00:00 2001 +From 2f22cd11bb5d2c42735f54bf02ab291ed03a039f Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 28 Jul 2014 11:42:11 +0100 Subject: [PATCH] Add an option for a global cache for any request on Mojang's 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 96% 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 index 6c65d49cb7..76474959e6 100644 --- 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 @@ -1,4 +1,4 @@ -From da0947583dc1dbf478a1c04ab155cc3d64136e71 Mon Sep 17 00:00:00 2001 +From ed0114c51238bcc29d5ed0d6db722a5754110bed Mon Sep 17 00:00:00 2001 From: Maxim Van de Wynckel Date: Wed, 30 Jul 2014 01:19:51 +0200 Subject: [PATCH] Only fetch an online UUID in online mode 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 99% 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 index 32f10b992e..360968f85a 100644 --- a/CraftBukkit-Patches/0147-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0145-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 6782704edc90554ab8a70d93f6bec734b6aef1b6 Mon Sep 17 00:00:00 2001 +From 726e89fcaa45d9106f9201065c6437890382dff7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 31 Jul 2014 17:48:20 +0100 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go diff --git a/CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch similarity index 97% rename from CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch rename to CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch index 0843df00ae..b317913021 100644 --- a/CraftBukkit-Patches/0148-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From eca4eae03ad12a47dd96990dd8e8951007a1ebf5 Mon Sep 17 00:00:00 2001 +From d4195edd0223b6d357c648005107cb51ca07a9ba Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak diff --git a/CraftBukkit-Patches/0149-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0147-Fix-Corrupted-Trapped-Chest.patch similarity index 91% rename from CraftBukkit-Patches/0149-Fix-Corrupted-Trapped-Chest.patch rename to CraftBukkit-Patches/0147-Fix-Corrupted-Trapped-Chest.patch index 74e0b04513..d5594df4ba 100644 --- a/CraftBukkit-Patches/0149-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0147-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From 8a76d65baf9d9591f24ebf008f8e1d96d52ba63b Mon Sep 17 00:00:00 2001 +From 239af67c64afc6f9b015408c5f44be522cf427ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest @@ -9,7 +9,7 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever This will now fix Trapped Chests too. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b5627c5..8b4278f 100644 +index c07f9f8..6dc3acf 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -114,7 +114,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0150-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch similarity index 95% rename from CraftBukkit-Patches/0150-Remove-uneeded-validation.patch rename to CraftBukkit-Patches/0148-Remove-uneeded-validation.patch index 4d92978069..371b2ffff6 100644 --- a/CraftBukkit-Patches/0150-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From 5f7fe70ea4af2e1d88a18470ad373e5fd5408067 Mon Sep 17 00:00:00 2001 +From 47c42b134d369d28d6634722a02e025efbcebedf Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 15 Aug 2014 18:11:09 -0400 Subject: [PATCH] Remove uneeded validation diff --git a/CraftBukkit-Patches/0151-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0149-Add-Hunger-Config-Values.patch similarity index 97% rename from CraftBukkit-Patches/0151-Add-Hunger-Config-Values.patch rename to CraftBukkit-Patches/0149-Add-Hunger-Config-Values.patch index 8b114cdd7b..7a5205a6f4 100644 --- a/CraftBukkit-Patches/0151-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0149-Add-Hunger-Config-Values.patch @@ -1,11 +1,11 @@ -From 1372f29a869fc690cf3f386b6e9dc09532200ddd Mon Sep 17 00:00:00 2001 +From ae5d52aafe172dd2d78dfa8f2970913be46d7ba2 Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index cf1cf37..4ccd4d5 100644 +index 9aa4f40..428d138 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1085,7 +1085,7 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/CraftBukkit-Patches/0152-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0150-Make-debug-logging-togglable.patch similarity index 97% rename from CraftBukkit-Patches/0152-Make-debug-logging-togglable.patch rename to CraftBukkit-Patches/0150-Make-debug-logging-togglable.patch index fd3ac9c106..143a202e22 100644 --- a/CraftBukkit-Patches/0152-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0150-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From 870475a482fbfbd4ca771d3be85630cff5427d59 Mon Sep 17 00:00:00 2001 +From e6618373f197fd45d2a54b4de38b8f148246dc76 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 17 Aug 2014 12:42:53 +0200 Subject: [PATCH] Make debug logging togglable. diff --git a/CraftBukkit-Patches/0153-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0151-Skip-invalid-enchants-in-CraftMetaItem.patch similarity index 95% rename from CraftBukkit-Patches/0153-Skip-invalid-enchants-in-CraftMetaItem.patch rename to CraftBukkit-Patches/0151-Skip-invalid-enchants-in-CraftMetaItem.patch index 91d4b42671..20591c2238 100644 --- a/CraftBukkit-Patches/0153-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0151-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From 894fbe91ced2095c5776641ff178de748732fadf Mon Sep 17 00:00:00 2001 +From 84d315fcfac69a89a465a3763052518ecd433ade Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 19 Aug 2014 11:04:21 +0100 Subject: [PATCH] Skip invalid enchants in CraftMetaItem diff --git a/CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0152-Limit-TNT-Detonations-per-tick.patch similarity index 95% rename from CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch rename to CraftBukkit-Patches/0152-Limit-TNT-Detonations-per-tick.patch index 3d59d67a3f..ce734649d9 100644 --- a/CraftBukkit-Patches/0154-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0152-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From ff0f3082ea5c282ddcaa8411a95b5e4d4e813154 Mon Sep 17 00:00:00 2001 +From d5856a3903d9a5723e5fc20e2dc02f898c7cb7fd Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Aug 2014 18:12:32 -0400 Subject: [PATCH] Limit TNT Detonations per tick @@ -19,7 +19,7 @@ index 98c8d26..3621faf 100644 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 8b4278f..c6e8321 100644 +index 6dc3acf..3bba0ca4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -575,6 +575,7 @@ 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 98% rename from CraftBukkit-Patches/0155-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch rename to CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 6bd5bdc6fa..cbfecfbd2e 100644 --- a/CraftBukkit-Patches/0155-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 166fdc1c6f2728e48f35b4afc61039261bcb8350 Mon Sep 17 00:00:00 2001 +From 48f78d86797015136f7864d705e8116372f0daaf Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:35:16 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/CraftBukkit-Patches/0156-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0154-Configurable-Hanging-Tick.patch similarity index 96% rename from CraftBukkit-Patches/0156-Configurable-Hanging-Tick.patch rename to CraftBukkit-Patches/0154-Configurable-Hanging-Tick.patch index 7e3692a808..38850b0b47 100644 --- a/CraftBukkit-Patches/0156-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0154-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From a3fc80cb344d91515b2f514b689063f83721b43b Mon Sep 17 00:00:00 2001 +From a2a0d41f68f877aceee931cf74561c5943424ec4 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 9 Aug 2014 13:56:51 -0400 Subject: [PATCH] Configurable Hanging Tick diff --git a/CraftBukkit-Patches/0157-Fix-Some-Memory-Leaks.patch b/CraftBukkit-Patches/0155-Fix-Some-Memory-Leaks.patch similarity index 98% rename from CraftBukkit-Patches/0157-Fix-Some-Memory-Leaks.patch rename to CraftBukkit-Patches/0155-Fix-Some-Memory-Leaks.patch index 7fa7ae3370..09a3ab735b 100644 --- a/CraftBukkit-Patches/0157-Fix-Some-Memory-Leaks.patch +++ b/CraftBukkit-Patches/0155-Fix-Some-Memory-Leaks.patch @@ -1,4 +1,4 @@ -From a83fd0eb5340c61459f0b70103cd0576375a182e Mon Sep 17 00:00:00 2001 +From 265ec5aa8f2b74de0554ebf4c7aafed6badbc5b6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 21 Sep 2014 10:06:01 +1000 Subject: [PATCH] Fix Some Memory Leaks diff --git a/CraftBukkit-Patches/0158-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0156-Refactor-ItemDoor-Place.patch similarity index 95% rename from CraftBukkit-Patches/0158-Refactor-ItemDoor-Place.patch rename to CraftBukkit-Patches/0156-Refactor-ItemDoor-Place.patch index 3dcc844c25..b66bf15240 100644 --- a/CraftBukkit-Patches/0158-Refactor-ItemDoor-Place.patch +++ b/CraftBukkit-Patches/0156-Refactor-ItemDoor-Place.patch @@ -1,4 +1,4 @@ -From 93d8b11854923443d2d26adbf395e5ade019c98c Mon Sep 17 00:00:00 2001 +From 3b7881a8ff912b29116055ae04f340e316851ece Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 30 Sep 2014 21:43:15 +1000 Subject: [PATCH] Refactor ItemDoor Place 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 90% rename from CraftBukkit-Patches/0159-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch rename to CraftBukkit-Patches/0157-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch index 76d82e9a4b..40105184f4 100644 --- a/CraftBukkit-Patches/0159-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch +++ b/CraftBukkit-Patches/0157-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch @@ -1,11 +1,11 @@ -From 1cb3de476b6b443341ad6e39987df680888a55fc Mon Sep 17 00:00:00 2001 +From 0b10d4ba0184c9649009efaf7ae4bc268971cd30 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 30 Sep 2014 21:49:10 +1000 Subject: [PATCH] Don't Fire InventoryCloseEvent Unless Required diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2f3ff86..5657e00 100644 +index 74e0930..efd247c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -828,6 +828,7 @@ public class CraftEventFactory { diff --git a/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch new file mode 100644 index 0000000000..e921354d86 --- /dev/null +++ b/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch @@ -0,0 +1,128 @@ +From 05fe4a53b170c3b9e66d794521448c8e39009056 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 0000000..f9a25e9 +--- /dev/null ++++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java +@@ -0,0 +1,47 @@ ++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 8b4b580..980dd99 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -121,6 +121,7 @@ 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]; +@@ -1689,6 +1690,20 @@ 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 8700b18..cb65795 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -18,6 +18,7 @@ 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.*; + +@@ -1427,6 +1428,20 @@ 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() +-- +2.1.0 +