From 894b59c400cc2746876d31574919bef6358945ef Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 8 Mar 2015 11:04:41 +0000 Subject: [PATCH] Rebuild patches --- Bukkit-Patches/0001-POM-Changes.patch | 4 +- Bukkit-Patches/0002-Spigot-Timings.patch | 2 +- .../0003-Add-PlayerItemDamageEvent.patch | 2 +- Bukkit-Patches/0004-BungeeCord-Support.patch | 2 +- Bukkit-Patches/0005-Add-Arrow-API.patch | 2 +- Bukkit-Patches/0006-Add-Particle-API.patch | 2 +- ...titySpawnEvent-and-SpawnerSpawnEvent.patch | 2 +- ...008-Entity-Mount-and-Dismount-Events.patch | 2 +- ...entoryClickEvent-getClickedInventory.patch | 2 +- ...lSessionData-to-the-Conversation-API.patch | 2 +- .../0011-Catch-Conversation-API-Errors.patch | 2 +- .../0012-Player-Collision-API.patch | 2 +- .../0013-Expand-Boolean-Prompt-Values.patch | 2 +- ...dd-Getter-for-Entity-Invulnerability.patch | 2 +- Bukkit-Patches/0015-Add-respawn-API.patch | 2 +- ...6-Fix-Plugin-Message-API-Disconnects.patch | 2 +- ...Fix-Tab-Completion-for-Some-Commands.patch | 2 +- ...-Implement-Locale-Getter-for-Players.patch | 2 +- ...-support-for-fetching-hidden-players.patch | 2 +- .../0020-Silenceable-Lightning-API.patch | 2 +- ...cation-on-some-player-lookup-methods.patch | 2 +- ...-team-API-to-allow-arbitrary-strings.patch | 2 +- .../0023-Add-Score.isScoreSet-Z-API.patch | 2 +- .../0024-Add-PlayerSpawnLocationEvent.patch | 2 +- ...ClassLoader-Deadlocks-Where-Possible.patch | 2 +- ...-slow-tab-complete-for-some-commands.patch | 2 +- ...Undeprecate-Player-updateInventory-V.patch | 2 +- ...kable-and-setUnbreakable-to-ItemMeta.patch | 2 +- Bukkit-Patches/0029-BungeeCord-Chat-API.patch | 2 +- CraftBukkit-Patches/0001-POM-Changes.patch | 2 +- CraftBukkit-Patches/0002-mc-dev-imports.patch | 2 +- .../0003-Skeleton-API-Implementations.patch | 2 +- .../0004-Obfuscation-Helpers.patch | 6 +-- .../0005-Spigot-Configuration.patch | 6 +-- .../0006-Better-Chunk-Tick-Selection.patch | 10 ++-- .../0007-Crop-Growth-Rates.patch | 2 +- ...0008-More-Efficient-Chunk-Save-Queue.patch | 2 +- .../0009-Merge-tweaks-and-configuration.patch | 6 +-- .../0010-Async-Operation-Catching.patch | 10 ++-- CraftBukkit-Patches/0011-View-Distance.patch | 4 +- CraftBukkit-Patches/0012-Spigot-Timings.patch | 46 +++++++++---------- ...b-Spawning-Relative-to-View-Distance.patch | 2 +- .../0014-Handle-Null-Tile-Entities.patch | 6 +-- .../0015-Entity-Activation-Range.patch | 8 ++-- CraftBukkit-Patches/0016-Metrics.patch | 2 +- .../0017-PlayerItemDamageEvent.patch | 2 +- .../0018-Prevent-NPE-in-CraftSign.patch | 2 +- .../0019-Entity-Tracking-Ranges.patch | 2 +- .../0020-Thread-Naming-and-Tweaks.patch | 2 +- .../0021-Close-Unloaded-Save-Files.patch | 2 +- .../0022-Remove-o-Option.patch | 2 +- .../0023-Recipe-Deconstruction.patch | 2 +- .../0024-Implement-Arrow-API.patch | 2 +- .../0025-Hopper-Customisations.patch | 2 +- .../0026-Implement-SpawnerSpawnEvent.patch | 2 +- .../0027-Firework-Meta-Crash-Fix.patch | 2 +- ...8-Allow-Disabling-of-Command-Logging.patch | 2 +- ...low-Disabling-of-Command-TabComplete.patch | 2 +- .../0030-Configurable-Messages.patch | 4 +- ...Disabling-of-Random-Lighting-Updates.patch | 6 +-- .../0032-Properly-Close-Inventories.patch | 2 +- .../0033-Disallow-Interaction-With-Self.patch | 2 +- ...034-Entity-Mount-and-Dismount-Events.patch | 2 +- ...vent-Ghost-Players-Caused-by-Plugins.patch | 4 +- .../0036-Plug-World-Unload-Memory-Leak.patch | 2 +- .../0037-Player-Collision-API.patch | 2 +- ...ly-Disable-Snooper-When-Not-Required.patch | 6 +-- ...dd-Getter-for-Entity-Invulnerability.patch | 2 +- .../0040-Cap-Minimum-Player-Speed.patch | 2 +- ...-and-Health-for-PlayerConsumeItemEve.patch | 2 +- ...eBlockEvent-for-Fire-Arrows-hitting-.patch | 2 +- ...-Disabling-of-1.6.3-Structure-Saving.patch | 2 +- .../0044-Item-Despawn-Rate.patch | 2 +- ...0045-Don-t-Special-Case-X-Move-Value.patch | 2 +- .../0046-Implement-respawn-API.patch | 2 +- .../0047-Arrow-Despawn-Rate.patch | 2 +- .../0048-Fix-packed-ice-generation.patch | 2 +- .../0049-Watchdog-Thread.patch | 8 ++-- .../0050-Clear-Flower-Pot-on-Drop.patch | 2 +- ...-chunks-not-being-sent-to-the-client.patch | 2 +- .../0052-Fix-Broken-Async-Chat.patch | 2 +- CraftBukkit-Patches/0053-Orebfuscator.patch | 8 ++-- .../0054-Optimize-DataWatcher.patch | 2 +- ...Fire-PreLogin-Events-in-Offline-Mode.patch | 2 +- .../0056-BungeeCord-Support.patch | 6 +-- ...Disabling-Zombie-Villager-Aggression.patch | 2 +- ...Configurable-Amount-of-Netty-Threads.patch | 6 +-- .../0059-Prevent-Mineshaft-Saving.patch | 2 +- ...0-Log-Cause-of-Unexpected-Exceptions.patch | 6 +-- CraftBukkit-Patches/0061-Particle-API.patch | 2 +- .../0062-Save-ticks-lived-to-nbttag.patch | 2 +- .../0063-More-Efficient-GetCubes.patch | 6 +-- ...d-Option-to-Nerf-Mobs-from-Spawner-s.patch | 2 +- ...-Warn-if-PermGen-may-be-insufficient.patch | 2 +- ...ble-Connected-Check-on-setScoreboard.patch | 2 +- .../0067-Add-Late-Bind-Option.patch | 2 +- ...low-statistics-to-be-disabled-forced.patch | 2 +- .../0069-Fix-ItemStack-Unbreakable-Code.patch | 2 +- ...Try-and-Debug-Crash-Reports-Crashing.patch | 8 ++-- .../0071-Improve-AutoSave-Mechanism.patch | 6 +-- ...ing-on-corrupted-map-data-NBT-arrays.patch | 2 +- ...f-ZombiePigmen-spawning-in-portal-bl.patch | 2 +- .../0074-Highly-Optimized-Tick-Loop.patch | 8 ++-- .../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 | 2 +- ...-Implement-Locale-Getter-for-Players.patch | 2 +- .../0080-Cap-Entity-Collisions.patch | 2 +- ...one-meal-not-having-the-correct-data.patch | 2 +- .../0082-Spam-Filter-Exclusions.patch | 2 +- ...tion-to-Silence-CommandBlock-Console.patch | 2 +- ...-support-for-fetching-hidden-players.patch | 2 +- ...Allow-Disabling-Creative-Item-Filter.patch | 2 +- .../0086-Cap-Channel-Registrations.patch | 2 +- ...mmands-to-be-the-main-version-of-a-c.patch | 2 +- ...-the-isDisconnected-method-by-bukkit.patch | 2 +- ...-Implement-Silenceable-Lightning-API.patch | 2 +- ...rmissibleBase-for-all-Command-Blocks.patch | 2 +- ...-Prevent-hoppers-from-loading-chunks.patch | 2 +- .../0092-Guard-Entity-List.patch | 8 ++-- ...dificationException-while-being-idle.patch | 8 ++-- ...ancellable-WitherSkull-potion-effect.patch | 2 +- ...riptive-kick-reasons-instead-of-Nope.patch | 2 +- ...dragon-death-and-wither-spawn-sounds.patch | 6 +-- ...n-client-crashes-server-lists-and-Mo.patch | 6 +-- .../0098-Treat-Bungee-as-Online-Mode.patch | 2 +- .../0099-Add-Conversion-Message.patch | 2 +- ...cel-fishing-event.-Fixes-BUKKIT-5396.patch | 2 +- ...101-Print-Stack-on-InternalException.patch | 2 +- ...Offline-Player-Data-Once-if-Required.patch | 2 +- ...ase-for-Non-Existent-Offline-Players.patch | 2 +- ...-Check-for-blank-OfflinePlayer-Names.patch | 2 +- .../0105-Fix-Player-Banning.patch | 2 +- .../0106-Fix-ban-expire-dates.patch | 2 +- .../0107-Correct-Ban-Expiration.patch | 4 +- .../0108-Convert-Horses-owner-to-UUID.patch | 2 +- ...-team-API-to-allow-arbitrary-strings.patch | 2 +- .../0110-Add-Score.isScoreSet-Z-API.patch | 2 +- .../0111-Log-null-TileEntity-Owner.patch | 2 +- ...ial-case-invalid-usernames-for-UUIDs.patch | 2 +- .../0113-Convert-player-skulls-async.patch | 2 +- ...ssDefError-crash-and-notify-on-crash.patch | 6 +-- .../0115-Check-Skull-canPlace.patch | 2 +- ...on-that-could-kill-connections-befor.patch | 2 +- .../0117-Configurable-UserCache-cap.patch | 2 +- ...8-Implement-PlayerSpawnLocationEvent.patch | 4 +- .../0119-Cap-Objective-Score-Length.patch | 2 +- ...tion-input-on-the-main-thread.-Fixes.patch | 2 +- ...able-save-on-stop-only-for-UserCache.patch | 6 +-- ...22-Prevent-Unbounded-IntCache-Growth.patch | 2 +- ...3-Add-damager-to-the-unhandled-error.patch | 2 +- ...124-Cross-World-Entity-Teleportation.patch | 2 +- ...-block-placement-interaction-packets.patch | 2 +- .../0126-Better-item-validation.patch | 2 +- .../0127-Further-Seed-Customisation.patch | 2 +- .../0128-Disable-ResourceLeakDetector.patch | 4 +- ...e-Information-to-session.lock-Errors.patch | 2 +- .../0130-Safer-JSON-Loading.patch | 2 +- .../0131-Fix-Slow-Loading-Libraries.patch | 2 +- .../0132-Add-CommandLine-EULA-Flag.patch | 2 +- ...ng-table-wiping-meta-when-placing-st.patch | 2 +- ...s-ocelots-when-plugins-spawn-ocelots.patch | 2 +- ...Prevent-a-crash-involving-attributes.patch | 2 +- ...ake-moved-wrongly-limit-configurable.patch | 2 +- .../0137-Fix-Null-Tile-Entity-Worlds.patch | 6 +-- ...moved-too-quickly-limit-configurable.patch | 2 +- ...-Apply-NBTReadLimiter-to-more-things.patch | 2 +- .../0140-Allow-Attribute-Capping.patch | 2 +- ...-fetch-an-online-UUID-in-online-mode.patch | 2 +- ...-modifiers-which-cause-the-attribute.patch | 2 +- .../0143-Plug-WorldMap-Memory-Leak.patch | 6 +-- .../0144-Fix-Corrupted-Trapped-Chest.patch | 4 +- .../0145-Remove-uneeded-validation.patch | 2 +- .../0146-Add-Hunger-Config-Values.patch | 2 +- .../0147-Make-debug-logging-togglable.patch | 2 +- ...ip-invalid-enchants-in-CraftMetaItem.patch | 2 +- .../0149-Limit-TNT-Detonations-per-tick.patch | 4 +- ...kable-and-setUnbreakable-to-ItemMeta.patch | 2 +- .../0151-Configurable-Hanging-Tick.patch | 2 +- .../0152-Fix-Some-Memory-Leaks.patch | 2 +- .../0153-Refactor-ItemDoor-Place.patch | 2 +- ...-InventoryCloseEvent-Unless-Required.patch | 2 +- .../0155-BungeeCord-Chat-API.patch | 2 +- ...6-Use-Standard-List-for-EntitySlices.patch | 2 +- ...-Allow-Capping-Tile-Entity-Tick-Time.patch | 12 ++--- ...astMatches-for-ItemStack-Dirty-Check.patch | 2 +- 187 files changed, 286 insertions(+), 286 deletions(-) diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 36bda493e3..752ab3da38 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From eaef9b5a74b7256497d5f048a61118d7403c7114 Mon Sep 17 00:00:00 2001 +From d891d4be23a02b08bc01d00115df54e08a8e46f7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 085883e..f29b8f7 100644 +index 9dd0d06..78f50bd 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ diff --git a/Bukkit-Patches/0002-Spigot-Timings.patch b/Bukkit-Patches/0002-Spigot-Timings.patch index 5a8f8a3dbf..f33f104ee1 100644 --- a/Bukkit-Patches/0002-Spigot-Timings.patch +++ b/Bukkit-Patches/0002-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 689cae373c73f7012af4983c0e860aacb30e5e2c Mon Sep 17 00:00:00 2001 +From e936ff8404ffc760fa6b35013d5a5aa0fb31fc5b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 2 Jun 2013 10:42:57 +1000 Subject: [PATCH] Spigot Timings diff --git a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch index ab508599b7..96f5b48850 100644 --- a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch +++ b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 9d86b5c2fb34a29f2359296b11741944cf852009 Mon Sep 17 00:00:00 2001 +From 8b80c8028e90874d6382b6355c2bfa1ef3f32d0c Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:31:20 +1100 Subject: [PATCH] Add PlayerItemDamageEvent diff --git a/Bukkit-Patches/0004-BungeeCord-Support.patch b/Bukkit-Patches/0004-BungeeCord-Support.patch index f690ec32c2..c00511f626 100644 --- a/Bukkit-Patches/0004-BungeeCord-Support.patch +++ b/Bukkit-Patches/0004-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From c140066e1e72dff10c6990391c2da4fcd3d49ae2 Mon Sep 17 00:00:00 2001 +From 69d4e2d62418e869b729afb72fac752cc9867f9a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support diff --git a/Bukkit-Patches/0005-Add-Arrow-API.patch b/Bukkit-Patches/0005-Add-Arrow-API.patch index 8b22d86547..0e8c95ca3e 100644 --- a/Bukkit-Patches/0005-Add-Arrow-API.patch +++ b/Bukkit-Patches/0005-Add-Arrow-API.patch @@ -1,4 +1,4 @@ -From 1107e878ce9a25d6d227c2f5911e50b9426ae5fc Mon Sep 17 00:00:00 2001 +From e3cb1034dbd5e6104b9608940e064b9ff3459a06 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:08:24 +1000 Subject: [PATCH] Add Arrow API diff --git a/Bukkit-Patches/0006-Add-Particle-API.patch b/Bukkit-Patches/0006-Add-Particle-API.patch index 8e7132011a..35ad0fdef6 100644 --- a/Bukkit-Patches/0006-Add-Particle-API.patch +++ b/Bukkit-Patches/0006-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From f7119640acf3aefc407193af0d008ad5778fe7a0 Mon Sep 17 00:00:00 2001 +From 8b3d44e37663dc4ed2dca9f48dc22aa2d4b4a220 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API diff --git a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch index 6252e22722..a5e64f8545 100644 --- a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch +++ b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From b16fcc0277690b95e0a0dccc467dcbe672d0fbcc Mon Sep 17 00:00:00 2001 +From ba12db25ac5b54b40b72db6c72ab90117a9ca455 Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:01 -0500 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent diff --git a/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch index 3a57e3c53d..b0849187d6 100644 --- a/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch +++ b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From af797118a38842d6300e9dd3db533d51ebdbfec0 Mon Sep 17 00:00:00 2001 +From b1d35ad51d9d4212545c99ae86f524a01eab893d Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:53 +1000 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch index a71a8a0861..ac41ffdf2b 100644 --- a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch +++ b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch @@ -1,4 +1,4 @@ -From 0e9484d192ed40fd73c72d200ed21b9663181c76 Mon Sep 17 00:00:00 2001 +From d125f464619755c15a17c3b0adb9aebf2f542b28 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 7 Jul 2013 10:32:05 -0400 Subject: [PATCH] InventoryClickEvent getClickedInventory diff --git a/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch b/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch index 5a9f94bedd..cdbf782959 100644 --- a/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch +++ b/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch @@ -1,4 +1,4 @@ -From 081d8be0bb12572c5c9945a971e8e3bc70a54342 Mon Sep 17 00:00:00 2001 +From 7bf1782e4502a1c496c1c37086fa11ebb07a8bd5 Mon Sep 17 00:00:00 2001 From: Alex Bennett Date: Thu, 11 Jul 2013 15:31:32 -0500 Subject: [PATCH] Added getAllSessionData() to the Conversation API. diff --git a/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch index fd1474ed35..1846455fa2 100644 --- a/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch +++ b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch @@ -1,4 +1,4 @@ -From 4039cbb3b48bfd5b9d12101aadd1cf85a50d9247 Mon Sep 17 00:00:00 2001 +From f5c4949d33fc3d140debef621a8f8cb7a0a4235a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 22 Jul 2013 19:09:43 +1000 Subject: [PATCH] Catch Conversation API Errors diff --git a/Bukkit-Patches/0012-Player-Collision-API.patch b/Bukkit-Patches/0012-Player-Collision-API.patch index aedffdf56f..412a3e975d 100644 --- a/Bukkit-Patches/0012-Player-Collision-API.patch +++ b/Bukkit-Patches/0012-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 11a025f86c9e1eea7da513911ab7ed16a58764f6 Mon Sep 17 00:00:00 2001 +From 9a694e870f7c2e879d6ad3025dcead613c0d038c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:20:50 +1000 Subject: [PATCH] Player Collision API diff --git a/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch index 3e1101f012..8ee45101ef 100644 --- a/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch +++ b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch @@ -1,4 +1,4 @@ -From d9817e86983bce15317ebcfe2b7f022ae1739f6d Mon Sep 17 00:00:00 2001 +From b5368a57b93cf6b2a8e6c4a7c6ed9ce1d0721210 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:42:16 +1000 Subject: [PATCH] Expand Boolean Prompt Values diff --git a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch index ac05517a4a..1689c8d5f2 100644 --- a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch +++ b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From 571575a4200bd728c3c561f2d54b4f53d6d257c4 Mon Sep 17 00:00:00 2001 +From c779725fc83b658a046c25ab3f66c036052d324b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:49:36 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/Bukkit-Patches/0015-Add-respawn-API.patch b/Bukkit-Patches/0015-Add-respawn-API.patch index 0f2a9a0f42..c12cce9cd8 100644 --- a/Bukkit-Patches/0015-Add-respawn-API.patch +++ b/Bukkit-Patches/0015-Add-respawn-API.patch @@ -1,4 +1,4 @@ -From c3acc780182736c8425c7cb4c863d715aab221d7 Mon Sep 17 00:00:00 2001 +From 429027da131e8b962220694075db98f376fe83e7 Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:35:58 +0200 Subject: [PATCH] Add respawn API. diff --git a/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch b/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch index a1a4a0e1ca..32769f2383 100644 --- a/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch +++ b/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch @@ -1,4 +1,4 @@ -From 01b001dbfffa571b1bfdd0e93078d5e45eb5893a Mon Sep 17 00:00:00 2001 +From b49464f5caf99a002acfa85c3cc56bdbee4f0477 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 19 Oct 2013 12:59:42 +1100 Subject: [PATCH] Fix Plugin Message API Disconnects diff --git a/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch b/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch index 5a511669b1..a34aa3ac81 100644 --- a/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch +++ b/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch @@ -1,4 +1,4 @@ -From a8e072d75fe03cc8a2223dc168209af41aa9a458 Mon Sep 17 00:00:00 2001 +From 7ca11bfbb3cafca7d3757dd3996e602fd341c97f Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 24 Dec 2013 10:14:25 +1100 Subject: [PATCH] Fix Tab Completion for Some Commands diff --git a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch index 7d6377191a..8e7b2f2b17 100644 --- a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch +++ b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 9872118ae85e59d9c21ef52a292c76b5ee9b1550 Mon Sep 17 00:00:00 2001 +From e924276d69a16e1d79e2d48d511df42775cc43e8 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:10:49 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch index e633896fca..4c37f48496 100644 --- a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch +++ b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From f7f681c0df320cebcb422096fe5e1277966c0e39 Mon Sep 17 00:00:00 2001 +From 36011cffe8c7bac88958cbe552179fb380cbe956 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:02:11 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch index db29e824be..fc39eefe9d 100644 --- a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 27f902f0f3e5f5433c2b6b57de05f1c9377b6770 Mon Sep 17 00:00:00 2001 +From a988407d71c84e3ef90de14c3ff65a96f9d87c1d Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:29 -0400 Subject: [PATCH] Silenceable Lightning API diff --git a/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch b/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch index f142d5f4de..5a1a25645f 100644 --- a/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch +++ b/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch @@ -1,4 +1,4 @@ -From df1fabfccd3c12db91cd70dbdde0fd9548ec8534 Mon Sep 17 00:00:00 2001 +From 93b6f873372e738e553ec8b492a2f684e020fd66 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 30 Mar 2014 15:58:22 +1100 Subject: [PATCH] Remove deprecation on some player lookup methods diff --git a/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch b/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch index 712f63ac4d..4b3fc953cb 100644 --- a/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From a7d96665f0fb75d63e5303a2e760acddcabd1df2 Mon Sep 17 00:00:00 2001 +From 283dd91bb895cb4cf2a6b1989fd386ab7643155a Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:22:26 +1000 Subject: [PATCH] Expand team API to allow arbitrary strings. diff --git a/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch b/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch index 4ed3db2c5c..f19b0d22fd 100644 --- a/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch +++ b/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From ec920caa2743fc3a032539493e96fd51f076d4a2 Mon Sep 17 00:00:00 2001 +From 329a878ba3ccd1d13de31644a2b82cca84fb1312 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:13 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. diff --git a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch b/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch index 25b06f6674..13bb1db8ed 100644 --- a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch +++ b/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From 0a5a22816e41523289aca5ec44126380bc9697c3 Mon Sep 17 00:00:00 2001 +From 54a99a5f2276ff976a9761de510c8f608c625b5b Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:01:32 +0200 Subject: [PATCH] Add PlayerSpawnLocationEvent. diff --git a/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch b/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch index 97b23b7763..0d61fc7d1a 100644 --- a/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch +++ b/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch @@ -1,4 +1,4 @@ -From 2ba02b2dcbcf4746d935e4bb91dfee0c8db9efeb Mon Sep 17 00:00:00 2001 +From be27bd9a37286960ad6cc36f7506b7c132e7643a Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Jul 2014 17:24:21 +1000 Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible diff --git a/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch index 21fb7270fb..9be5af45e3 100644 --- a/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch +++ b/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch @@ -1,4 +1,4 @@ -From 7b8f24dfa0f3330c0bf3b554f66a4151f5d8b8f8 Mon Sep 17 00:00:00 2001 +From b0c692aebcc6fbf8fbd53e71cb5aee4b6ec750e7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 22 Jul 2014 21:01:32 +1000 Subject: [PATCH] Fix slow tab complete for some commands. diff --git a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch b/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch index b6de7093e6..dba481ad6b 100644 --- a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch +++ b/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch @@ -1,4 +1,4 @@ -From 0ac0cc773249d1d92d2f6ccbbf86bb17b558efcd Mon Sep 17 00:00:00 2001 +From 842dc66ea002c8083bdd26df9babecdd23adda6f Mon Sep 17 00:00:00 2001 From: drXor Date: Wed, 23 Jul 2014 15:50:36 -0400 Subject: [PATCH] Undeprecate Player#updateInventory()V diff --git a/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 2e29616e32..aa8a82c77d 100644 --- a/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 02bf5d1c82da784135f5519c58b0d7e6157971b7 Mon Sep 17 00:00:00 2001 +From f86c7781ee4d20a2b45bedbab35771c594b123f0 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:31:04 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch b/Bukkit-Patches/0029-BungeeCord-Chat-API.patch index b9b144a4aa..07a81b2fb9 100644 --- a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch +++ b/Bukkit-Patches/0029-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From b21ee76703ea474fb5417e41846220635a56b375 Mon Sep 17 00:00:00 2001 +From 7c12bc8c5ebec34d41f20d6d813be4ab1b817f5f 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/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index 3b90aad845..b92f5f586a 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 8aef7c3b71fe438e210691764d955554efd55040 Mon Sep 17 00:00:00 2001 +From 9559d82514814e006a54738572cbe0f313c2f639 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index afeab3753e..c510a975b8 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From 8a02778847d1de2be3ea1e3a136968a13f989d96 Mon Sep 17 00:00:00 2001 +From d69d53f8ab2ce47b0b39cd6bce280146f4ae04b4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index cc20823e77..45b1c1df9e 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From e31c5dbce193a2d4aaedd1094e2d37821bdeba7b Mon Sep 17 00:00:00 2001 +From af542d3375e7b4fa8fed4bca3c6a8460ed1f4257 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations diff --git a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch index 8f9b4f69a9..0f1c61c70b 100644 --- a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch +++ b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch @@ -1,4 +1,4 @@ -From a5d8ed7311a8a717390419672a8b7b4165adad01 Mon Sep 17 00:00:00 2001 +From 739b1d49598331c16444398df4315cff5ce5f473 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 10:38:04 +1000 Subject: [PATCH] Obfuscation Helpers @@ -6,10 +6,10 @@ Subject: [PATCH] Obfuscation Helpers Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4219e7b..486e652 100644 +index 47aff5a..738fb52 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1288,6 +1288,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -1284,6 +1284,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } diff --git a/CraftBukkit-Patches/0005-Spigot-Configuration.patch b/CraftBukkit-Patches/0005-Spigot-Configuration.patch index dcab6ceafb..5358598c56 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 0b8be4fd43a70c45431189ab67cc200fa0669586 Mon Sep 17 00:00:00 2001 +From 87a1b9de0edd52ea0f5b7ba3c313b99770259d74 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -35,7 +35,7 @@ index d57a796..8bc6ad6 100644 if (!this.getOnlineMode()) { DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5c2e218..345ede9 100644 +index 9b0e0ed..437c64d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -99,6 +99,7 @@ public abstract class World implements IBlockAccess { @@ -53,7 +53,7 @@ index 5c2e218..345ede9 100644 + this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); - this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit + if (gen != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 4b3fcac..2aceeb4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch index 40a9f81fc7..d42d0185bb 100644 --- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch @@ -1,4 +1,4 @@ -From 33973c35cda51ba40c37a81cd5772b3003b95c8b Mon Sep 17 00:00:00 2001 +From 1dc62bd472d5ecaa6a0d08c963796e1499bff2bc Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:56:02 +1000 Subject: [PATCH] Better Chunk Tick Selection @@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection An optimized chunk ticking algorithm which better selects chunks around players which are active on the server. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 345ede9..bed457a 100644 +index 437c64d..bc0d479 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -65,7 +65,7 @@ public abstract class World implements IBlockAccess { @@ -50,7 +50,7 @@ index 345ede9..bed457a 100644 public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot public CraftWorld getWorld() { -@@ -120,6 +145,12 @@ public abstract class World implements IBlockAccess { +@@ -123,6 +148,12 @@ public abstract class World implements IBlockAccess { this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit // CraftBukkit end @@ -63,7 +63,7 @@ index 345ede9..bed457a 100644 this.L = this.random.nextInt(12000); this.allowMonsters = true; this.allowAnimals = true; -@@ -1945,17 +1976,44 @@ public abstract class World implements IBlockAccess { +@@ -1948,17 +1979,44 @@ public abstract class World implements IBlockAccess { int k; int l; @@ -112,7 +112,7 @@ index 345ede9..bed457a 100644 this.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9f96e11..f4d313e 100644 +index 1587cf2..b04b512 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -344,12 +344,15 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch index 8fd499477e..cc98fabe60 100644 --- a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From b018b675a420b7150b58a336044582a1ce034ba6 Mon Sep 17 00:00:00 2001 +From 5c4995c2fc8ca3530f65c62daf69a75d0244ae97 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:17:20 +1000 Subject: [PATCH] Crop Growth Rates diff --git a/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch index 79c7c87e14..93776465c0 100644 --- a/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch +++ b/CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch @@ -1,4 +1,4 @@ -From a343b092ffaac6e336eef36fac78bb6ad4962d1c Mon Sep 17 00:00:00 2001 +From 9bf8623ff0667c6d6d10b4d1276e0a86c59f8d65 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:09:45 +1000 Subject: [PATCH] More Efficient Chunk Save Queue diff --git a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch index b4bedddc3b..8b83358447 100644 --- a/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From d715d750c402d8651a2df9457336ad821ba3085a Mon Sep 17 00:00:00 2001 +From d23b5e9c3bd170760516f2b11e4be553dd5696a2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -41,10 +41,10 @@ index 1e575fe..fa7e6df 100644 } } else { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bed457a..581224f 100644 +index bc0d479..33edb6d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -967,6 +967,23 @@ public abstract class World implements IBlockAccess { +@@ -970,6 +970,23 @@ public abstract class World implements IBlockAccess { // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead event = CraftEventFactory.callProjectileLaunchEvent(entity); } diff --git a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch index f7abd90bcd..8f8887da1a 100644 --- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 96589be25d952b55e40a187d76180559f16c4e66 Mon Sep 17 00:00:00 2001 +From b8b201abbbe9c86165bb5e6452f5ed65a4bcf5a7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -78,10 +78,10 @@ index 5ef2be4..8d50e05 100644 this.trackedPlayers.remove(entityplayer); entityplayer.d(this.tracker); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 581224f..a67736a 100644 +index 33edb6d..5e25f3f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -937,6 +937,7 @@ public abstract class World implements IBlockAccess { +@@ -940,6 +940,7 @@ public abstract class World implements IBlockAccess { } public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason @@ -89,7 +89,7 @@ index 581224f..a67736a 100644 if (entity == null) return false; // CraftBukkit end int i = MathHelper.floor(entity.locX / 16.0D); -@@ -1044,6 +1045,7 @@ public abstract class World implements IBlockAccess { +@@ -1047,6 +1048,7 @@ public abstract class World implements IBlockAccess { } public void removeEntity(Entity entity) { @@ -97,7 +97,7 @@ index 581224f..a67736a 100644 entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); -@@ -2474,6 +2476,7 @@ public abstract class World implements IBlockAccess { +@@ -2484,6 +2486,7 @@ public abstract class World implements IBlockAccess { } public void b(Collection collection) { diff --git a/CraftBukkit-Patches/0011-View-Distance.patch b/CraftBukkit-Patches/0011-View-Distance.patch index 4cf49455f5..7a1c769dc1 100644 --- a/CraftBukkit-Patches/0011-View-Distance.patch +++ b/CraftBukkit-Patches/0011-View-Distance.patch @@ -1,4 +1,4 @@ -From b0d1021f4563af84588befe541738357b38a8cbb Mon Sep 17 00:00:00 2001 +From ed3bb3dddd315ad5efd3b9bc82736cf8c1e2738c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -22,7 +22,7 @@ index 688d6f0..abb24c8 100644 public WorldServer a() { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f4d313e..08b21a5 100644 +index b04b512..31bb2eb 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -61,7 +61,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0012-Spigot-Timings.patch b/CraftBukkit-Patches/0012-Spigot-Timings.patch index 0170823b78..baf45de818 100644 --- a/CraftBukkit-Patches/0012-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 6b26c0f937b54831297537d4753d9cc6d3acdbcb Mon Sep 17 00:00:00 2001 +From ce8c304984522d44281eb7b859d7c9783f3e9234 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -242,7 +242,7 @@ index 256953f..24aaec5 100644 this.world.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 486e652..61abf67 100644 +index 738fb52..96d38b6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -46,6 +46,7 @@ import joptsimple.OptionSet; @@ -253,7 +253,7 @@ index 486e652..61abf67 100644 import org.bukkit.craftbukkit.util.Waitable; import org.bukkit.event.server.RemoteServerCommandEvent; import org.bukkit.event.world.WorldSaveEvent; -@@ -617,6 +618,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -613,6 +614,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs protected void y() {} protected void z() throws ExceptionWorldConflict { // CraftBukkit - added throws @@ -261,7 +261,7 @@ index 486e652..61abf67 100644 long i = System.nanoTime(); ++this.ticks; -@@ -643,10 +645,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -639,10 +641,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit @@ -274,7 +274,7 @@ index 486e652..61abf67 100644 } this.methodProfiler.a("tallying"); -@@ -663,6 +667,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -659,6 +663,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.methodProfiler.b(); this.methodProfiler.b(); @@ -283,7 +283,7 @@ index 486e652..61abf67 100644 } public void A() { -@@ -677,16 +683,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -673,16 +679,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.methodProfiler.c("levels"); @@ -307,7 +307,7 @@ index 486e652..61abf67 100644 // Send time updates to everyone, it will get the right time from the world the player is in. if (this.ticks % 20 == 0) { for (int i = 0; i < this.getPlayerList().players.size(); ++i) { -@@ -694,6 +707,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -690,6 +703,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time } } @@ -315,7 +315,7 @@ index 486e652..61abf67 100644 int i; -@@ -717,7 +731,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -713,7 +727,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs CrashReport crashreport; try { @@ -325,7 +325,7 @@ index 486e652..61abf67 100644 } catch (Throwable throwable) { crashreport = CrashReport.a(throwable, "Exception ticking world"); worldserver.a(crashreport); -@@ -725,7 +741,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -721,7 +737,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } try { @@ -335,7 +335,7 @@ index 486e652..61abf67 100644 } catch (Throwable throwable1) { crashreport = CrashReport.a(throwable1, "Exception ticking world entities"); worldserver.a(crashreport); -@@ -734,7 +752,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -730,7 +748,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.methodProfiler.b(); this.methodProfiler.a("tracker"); @@ -345,7 +345,7 @@ index 486e652..61abf67 100644 this.methodProfiler.b(); this.methodProfiler.b(); // } // CraftBukkit -@@ -743,14 +763,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -739,14 +759,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } this.methodProfiler.c("connection"); @@ -419,7 +419,7 @@ index 8afd376..71bf63a 100644 private static Map> f = Maps.newHashMap(); private static Map, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a67736a..bf4c758 100644 +index 5e25f3f..d141c98 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,6 +18,7 @@ import org.bukkit.Bukkit; @@ -439,7 +439,7 @@ index a67736a..bf4c758 100644 public CraftWorld getWorld() { return this.world; } -@@ -190,6 +193,7 @@ public abstract class World implements IBlockAccess { +@@ -193,6 +196,7 @@ public abstract class World implements IBlockAccess { }); this.getServer().addWorld(this.world); // CraftBukkit end @@ -447,7 +447,7 @@ index a67736a..bf4c758 100644 } public World b() { -@@ -1299,6 +1303,7 @@ public abstract class World implements IBlockAccess { +@@ -1302,6 +1306,7 @@ public abstract class World implements IBlockAccess { this.g.clear(); this.methodProfiler.c("regular"); @@ -455,7 +455,7 @@ index a67736a..bf4c758 100644 // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { entity = (Entity) this.entityList.get(this.tickPosition); -@@ -1315,7 +1320,9 @@ public abstract class World implements IBlockAccess { +@@ -1318,7 +1323,9 @@ public abstract class World implements IBlockAccess { this.methodProfiler.a("tick"); if (!entity.dead) { try { @@ -465,7 +465,7 @@ index a67736a..bf4c758 100644 } catch (Throwable throwable1) { crashreport = CrashReport.a(throwable1, "Ticking entity"); crashreportsystemdetails = crashreport.a("Entity being ticked"); -@@ -1340,7 +1347,9 @@ public abstract class World implements IBlockAccess { +@@ -1343,7 +1350,9 @@ public abstract class World implements IBlockAccess { this.methodProfiler.b(); } @@ -475,7 +475,7 @@ index a67736a..bf4c758 100644 this.M = true; // CraftBukkit start - From below, clean up tile entities before ticking them if (!this.c.isEmpty()) { -@@ -1359,6 +1368,7 @@ public abstract class World implements IBlockAccess { +@@ -1362,6 +1371,7 @@ public abstract class World implements IBlockAccess { if (this.isLoaded(blockposition) && this.N.a(blockposition)) { try { @@ -483,7 +483,7 @@ index a67736a..bf4c758 100644 ((IUpdatePlayerListBox) tileentity).c(); } catch (Throwable throwable2) { CrashReport crashreport1 = CrashReport.a(throwable2, "Ticking block entity"); -@@ -1367,6 +1377,11 @@ public abstract class World implements IBlockAccess { +@@ -1370,6 +1380,11 @@ public abstract class World implements IBlockAccess { tileentity.a(crashreportsystemdetails1); throw new ReportedException(crashreport1); } @@ -495,7 +495,7 @@ index a67736a..bf4c758 100644 } } -@@ -1379,6 +1394,8 @@ public abstract class World implements IBlockAccess { +@@ -1382,6 +1397,8 @@ public abstract class World implements IBlockAccess { } } @@ -504,7 +504,7 @@ index a67736a..bf4c758 100644 this.M = false; /* CraftBukkit start - Moved up if (!this.c.isEmpty()) { -@@ -1411,6 +1428,7 @@ public abstract class World implements IBlockAccess { +@@ -1414,6 +1431,7 @@ public abstract class World implements IBlockAccess { this.b.clear(); } @@ -512,7 +512,7 @@ index a67736a..bf4c758 100644 this.methodProfiler.b(); this.methodProfiler.b(); } -@@ -1455,6 +1473,7 @@ public abstract class World implements IBlockAccess { +@@ -1458,6 +1476,7 @@ public abstract class World implements IBlockAccess { // CraftBukkit start - Use neighbor cache instead of looking up Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4); if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.isAreaLoaded(i - b0, 0, j - b0, i + b0, 0, j + b0) */) { @@ -520,7 +520,7 @@ index a67736a..bf4c758 100644 // CraftBukkit end entity.P = entity.locX; entity.Q = entity.locY; -@@ -1518,6 +1537,7 @@ public abstract class World implements IBlockAccess { +@@ -1521,6 +1540,7 @@ public abstract class World implements IBlockAccess { } } @@ -529,7 +529,7 @@ index a67736a..bf4c758 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 08b21a5..af4a551 100644 +index 31bb2eb..cd07095 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -210,10 +210,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch index eda3ec85b9..7b2b3fdef6 100644 --- a/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From 5bf8504ba7b121589bb1244e4d1bc77eea87e938 Mon Sep 17 00:00:00 2001 +From 443e7bdd84b69b218b3605e9115ce9881c10a1ad Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:29:54 +1000 Subject: [PATCH] Fix Mob Spawning Relative to View Distance diff --git a/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch index 1b6d097fb9..a6d70c8e08 100644 --- a/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch @@ -1,14 +1,14 @@ -From e05b61bd35a73364115bba2cf092b4a168a85dcc Mon Sep 17 00:00:00 2001 +From bee61fa06a11c6801d572612e9db8836b481cd3f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Handle Null Tile Entities diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bf4c758..c78c2d8 100644 +index d141c98..40faa66 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1362,6 +1362,13 @@ public abstract class World implements IBlockAccess { +@@ -1365,6 +1365,13 @@ public abstract class World implements IBlockAccess { while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); diff --git a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch index 9e41d23350..aa98e8615d 100644 --- a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 8bf46817709567086980648b133a6f148823dafd Mon Sep 17 00:00:00 2001 +From 4c0c9850ed8e0d16ab2a08b3cd6c638a3958d713 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -196,10 +196,10 @@ index 24aaec5..e90ff2f 100644 public void G() { this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c78c2d8..6a975d3 100644 +index 40faa66..5116444 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1303,6 +1303,7 @@ public abstract class World implements IBlockAccess { +@@ -1306,6 +1306,7 @@ public abstract class World implements IBlockAccess { this.g.clear(); this.methodProfiler.c("regular"); @@ -207,7 +207,7 @@ index c78c2d8..6a975d3 100644 timings.entityTick.startTiming(); // Spigot // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { -@@ -1477,9 +1478,11 @@ public abstract class World implements IBlockAccess { +@@ -1480,9 +1481,11 @@ public abstract class World implements IBlockAccess { int j = MathHelper.floor(entity.locZ); byte b0 = 32; diff --git a/CraftBukkit-Patches/0016-Metrics.patch b/CraftBukkit-Patches/0016-Metrics.patch index da60bfd93f..f21104b522 100644 --- a/CraftBukkit-Patches/0016-Metrics.patch +++ b/CraftBukkit-Patches/0016-Metrics.patch @@ -1,4 +1,4 @@ -From d43cb74feda3fbf8926bd8a5976bdf080ef1b7bd Mon Sep 17 00:00:00 2001 +From 28205cc367394da317ed298563cb1afb2b1955cc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics diff --git a/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch index 13da05f569..7ac9a469c2 100644 --- a/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 1447382b4c93fa76fea2224645c098378fed842f Mon Sep 17 00:00:00 2001 +From 7230fb058e223a98656be635d9df294b09850a19 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:45:52 +1100 Subject: [PATCH] PlayerItemDamageEvent diff --git a/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch index 8b33121502..a3b4c98685 100644 --- a/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From 0fc477fceaa65b72cb18e542807c922c25e3ea09 Mon Sep 17 00:00:00 2001 +From 3a5a748f61e6319b40762319333d5fdde3d9ef1c Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 18 Mar 2013 20:01:44 +1100 Subject: [PATCH] Prevent NPE in CraftSign diff --git a/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch index 811ebcec69..a626e02795 100644 --- a/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 3610083330f3022f069598e344801350f76fa74e Mon Sep 17 00:00:00 2001 +From bf159007e9934710d7427b9d9fdba4f9a052f8d7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges diff --git a/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch index b0c5cca902..1f6f74d1a7 100644 --- a/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From 4a0dd916ac1f28729c9a269f5213c7340f1aad0e Mon Sep 17 00:00:00 2001 +From 6e843f7ecb84a851340a837a34bea344e0d5b56e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 23 Apr 2013 11:50:27 +1000 Subject: [PATCH] Thread Naming and Tweaks diff --git a/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch index a55144e772..2d9972a01e 100644 --- a/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From 0e944971858decdee97370dc2da8cc1f94bce1e1 Mon Sep 17 00:00:00 2001 +From 51dae18859d8773e1af0b34cbb9066d8039db4ac Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files diff --git a/CraftBukkit-Patches/0022-Remove-o-Option.patch b/CraftBukkit-Patches/0022-Remove-o-Option.patch index 176b1f4dab..8db3d1797c 100644 --- a/CraftBukkit-Patches/0022-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0022-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From 6edd9fd1c7bd9f906f4668e9be876fc679557e08 Mon Sep 17 00:00:00 2001 +From b02d69d3e5f8901a98ba7861012fbfaffa1219ab Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option diff --git a/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch index cf4efce16e..ede0f6e605 100644 --- a/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0023-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From 157bffdb7ed6d858ad9055e98c25ba08488126eb Mon Sep 17 00:00:00 2001 +From 431b05b1cb027066192b092f1d36509367c135bb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 1 Jun 2013 16:34:38 +1000 Subject: [PATCH] Recipe Deconstruction diff --git a/CraftBukkit-Patches/0024-Implement-Arrow-API.patch b/CraftBukkit-Patches/0024-Implement-Arrow-API.patch index 3301e7d7c1..1263a58751 100644 --- a/CraftBukkit-Patches/0024-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0024-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From 094f53bc27b0ac80ef7d0142db127b8ffecfd12d Mon Sep 17 00:00:00 2001 +From 0a6d63cf9c9a2df92c5bb37a68f1594bf717c241 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:16:05 +1000 Subject: [PATCH] Implement Arrow API diff --git a/CraftBukkit-Patches/0025-Hopper-Customisations.patch b/CraftBukkit-Patches/0025-Hopper-Customisations.patch index 0c73b37373..d22b0fec4d 100644 --- a/CraftBukkit-Patches/0025-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0025-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From a1f5331d1b57175a29474e6c1465db9c9d56b5af Mon Sep 17 00:00:00 2001 +From d6d400e05c13b2b5b7937d4bd63a336fe3a482ea Mon Sep 17 00:00:00 2001 From: erocs Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations diff --git a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch index 68c0dccdf8..0dd5c9f61a 100644 --- a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 7c6666fbd139bdc6e3b1171158299b8b00429488 Mon Sep 17 00:00:00 2001 +From c9a07ec955ed97a9a6ac5a4c38b5ae48bf98a91e Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:37 -0500 Subject: [PATCH] Implement SpawnerSpawnEvent. diff --git a/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch index 96afcccd57..393321be25 100644 --- a/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch +++ b/CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch @@ -1,4 +1,4 @@ -From a10a1d12c71d080ddbd92db34de2bfe18a2fbc78 Mon Sep 17 00:00:00 2001 +From bc2f2b83b8e3c547339822df72f265f5bafacf43 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 15 Jun 2013 21:34:48 +1000 Subject: [PATCH] Firework Meta Crash Fix diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch index 336df77b51..3f018d63be 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch @@ -1,4 +1,4 @@ -From 13dc74685ff2babf3e4f068a0b1c519f515b884c Mon Sep 17 00:00:00 2001 +From 54c5246ad26fa7f5728b2b26928e9e16f2ff2be8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:01:29 +1000 Subject: [PATCH] Allow Disabling of Command Logging diff --git a/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch index b9af9564fd..27a744b0ca 100644 --- a/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch @@ -1,4 +1,4 @@ -From 68e5367a039241677a762a1af4b76c90a5ef6e53 Mon Sep 17 00:00:00 2001 +From a5e7345a25a12e589e3fc6971e3fd84c8a7d690a Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/CraftBukkit-Patches/0030-Configurable-Messages.patch b/CraftBukkit-Patches/0030-Configurable-Messages.patch index baf1e12b63..2a39a059fc 100644 --- a/CraftBukkit-Patches/0030-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0030-Configurable-Messages.patch @@ -1,4 +1,4 @@ -From 2697f8ced8ddd323cd47b8c74799dc4dafedc5a8 Mon Sep 17 00:00:00 2001 +From 99d8980c925322999a44f8dceb63a114d5c05402 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages @@ -23,7 +23,7 @@ index 98f40f1..8f421f3 100644 this.b.close(chatcomponenttext); } else { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 64b755d..e396288 100644 +index f8145b0..96aede6 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -418,7 +418,7 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch index 0f3429e466..0e3cb3f8a1 100644 --- a/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,4 +1,4 @@ -From 1efa3a7b78341805aff195eedcce8094fca56682 Mon Sep 17 00:00:00 2001 +From 7f73cd075e1a1a9a55d562c1893b9a7f5504500d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:12:02 +1000 Subject: [PATCH] Allow Disabling of Random Lighting Updates @@ -18,10 +18,10 @@ index 92b25f0..ab971cf 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6a975d3..8fc5c71 100644 +index 5116444..f32985f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2071,7 +2071,7 @@ public abstract class World implements IBlockAccess { +@@ -2074,7 +2074,7 @@ public abstract class World implements IBlockAccess { } this.methodProfiler.a("playerCheckLight"); diff --git a/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch index 0eb97a7b01..f6f06320f2 100644 --- a/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0032-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From 1aee6e97da0635b4c3df6e10290b98ee9ae03850 Mon Sep 17 00:00:00 2001 +From 855af52bcc82a9b02da539c3c836d547e460d8d5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 27 Jun 2013 17:26:09 +1000 Subject: [PATCH] Properly Close Inventories diff --git a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch index 689f335d2d..82457d4836 100644 --- a/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch @@ -1,4 +1,4 @@ -From 35548f6d4f97ccfd58b93c6758e5bcf5b07c12ca Mon Sep 17 00:00:00 2001 +From 7c37d59b3f35e2214ee932c260c86aab90023d13 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 28 Jun 2013 19:52:54 +1000 Subject: [PATCH] Disallow Interaction With Self diff --git a/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch index 27938d8df3..4f201db746 100644 --- a/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From b52a30de982b0edca30416c5075cc4228fb76cf2 Mon Sep 17 00:00:00 2001 +From 1bdbfbcf9433019f137b2a2d3b38fbce3ed7c694 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:49 +1000 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch index ec81443fb3..a945640c6a 100644 --- a/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From d2dadf6c02543ca71f6f8b85e5cb2f6046dbbc12 Mon Sep 17 00:00:00 2001 +From a7d04bd5aff0adb428acff5976763e69fc9410f9 Mon Sep 17 00:00:00 2001 From: Alex Ciuba Date: Tue, 11 Jun 2013 15:23:03 -0400 Subject: [PATCH] Prevent Ghost Players Caused by Plugins @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins Check if the player is still connected after firing event. Fixes BUKKIT-4327 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e396288..f24739d 100644 +index 96aede6..7f3be50 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -548,6 +548,11 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch index b604faac44..ccf11205b9 100644 --- a/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch +++ b/CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch @@ -1,4 +1,4 @@ -From b61ff25808179d81c140fdff162e6e84f1e43fab Mon Sep 17 00:00:00 2001 +From 22ac72163c0c404835bbda88a9bb41ba491477ae Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:02:59 +1000 Subject: [PATCH] Plug World Unload Memory Leak diff --git a/CraftBukkit-Patches/0037-Player-Collision-API.patch b/CraftBukkit-Patches/0037-Player-Collision-API.patch index fb0f5d7a9f..b367ee93c7 100644 --- a/CraftBukkit-Patches/0037-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0037-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From a3aa58034bd77397a293f64aab4e88ac804917a2 Mon Sep 17 00:00:00 2001 +From f1dfb80663f7abb86d87c43d35bac5cbfa983d2a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API diff --git a/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch index f4379aab1b..055e34f947 100644 --- a/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch +++ b/CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch @@ -1,14 +1,14 @@ -From 4bd1dd657b32a94cbc065a2189d77e5a7779732f Mon Sep 17 00:00:00 2001 +From 59b26c473525c8d634abc4f5b426bb154b4298f6 Mon Sep 17 00:00:00 2001 From: agentk20 Date: Sat, 3 Aug 2013 19:28:48 +1000 Subject: [PATCH] Fully Disable Snooper When Not Required diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 61abf67..b7a8a4c 100644 +index 96d38b6..c90cbcc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -657,11 +657,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -653,11 +653,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.h[this.ticks % 100] = System.nanoTime() - i; this.methodProfiler.b(); this.methodProfiler.a("snooper"); diff --git a/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch index 04499ce980..b031b82cfe 100644 --- a/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From 49d817977c0e7021a305e98a9df7d3575f1c298e Mon Sep 17 00:00:00 2001 +From f9ab67a94655dc471e13fdcaad405ee26783ddeb Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sat, 3 Aug 2013 19:53:48 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch index ab63fdfcaa..137e7b1342 100644 --- a/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch @@ -1,4 +1,4 @@ -From 8ac4f210d0dd342a3569297679026acda3533ba2 Mon Sep 17 00:00:00 2001 +From 185aa15dbc89fc126c1d130ec40b7856cadbe77b Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 5 Aug 2013 20:17:20 +1000 Subject: [PATCH] Cap Minimum Player Speed diff --git a/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch index 57a4cdd5d7..7610046dda 100644 --- a/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch +++ b/CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch @@ -1,4 +1,4 @@ -From 68e60e378b8ac8c3799012194a71f417f9726159 Mon Sep 17 00:00:00 2001 +From a683e020608b7bcdab85f66b0691e43b0db4fe50 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 14 Sep 2013 10:16:38 +1000 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent diff --git a/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index afb867e895..6c35606e1a 100644 --- a/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From 83d50f5bf12811352b54643722ddfc0348a5c658 Mon Sep 17 00:00:00 2001 +From ff590db56efdc04faf59d1754b60a7ed8c746621 Mon Sep 17 00:00:00 2001 From: BlackHole Date: Tue, 16 Jul 2013 22:34:50 +0200 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT diff --git a/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch index a3105fb189..febff4eec5 100644 --- a/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From 9fe0e6a0eb3e48eb3b1668c800cba2b45dd052a4 Mon Sep 17 00:00:00 2001 +From 9b38c1c2a1c812f1d4051367bc1793083ccb4ea8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 21 Sep 2013 12:33:09 +1000 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving diff --git a/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch index dff5b30921..697a25661b 100644 --- a/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0044-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 37d47654d1062f881edd92496fb62005521b8127 Mon Sep 17 00:00:00 2001 +From f6c0db898ff4bd6d86b4ef006a1d7a0f59824d92 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Sep 2013 19:10:53 +1000 Subject: [PATCH] Item Despawn Rate diff --git a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch index bc1b49e169..ec95be9317 100644 --- a/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch @@ -1,4 +1,4 @@ -From b1712073a0f13630cfb261c29299ccc1328d8d02 Mon Sep 17 00:00:00 2001 +From 54d62db063d3b9ba298516e607b102f49fa50576 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 6 Oct 2013 17:36:28 +1100 Subject: [PATCH] Don't Special Case X Move Value diff --git a/CraftBukkit-Patches/0046-Implement-respawn-API.patch b/CraftBukkit-Patches/0046-Implement-respawn-API.patch index 4fafb2fdff..5949073ce1 100644 --- a/CraftBukkit-Patches/0046-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0046-Implement-respawn-API.patch @@ -1,4 +1,4 @@ -From e779bd6a7bcec77b4cafc43b02749891a844c57f Mon Sep 17 00:00:00 2001 +From bd0dee6279b5d4087355f0cbd9a7111a47df71ba Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:34:49 +0200 Subject: [PATCH] Implement respawn API. diff --git a/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch index f11c6c696d..7dcf055505 100644 --- a/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From c9433b9cc24018bc3fb0c172a7792aebc8bbf536 Mon Sep 17 00:00:00 2001 +From b07b50b630caaa20c7bc5ed0397b3991a0720e59 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Oct 2013 19:20:10 +1100 Subject: [PATCH] Arrow Despawn Rate diff --git a/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch index b2a540841e..c86c891707 100644 --- a/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch +++ b/CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch @@ -1,4 +1,4 @@ -From ac1c585ef55565675089fe2fd8e73955f6f94532 Mon Sep 17 00:00:00 2001 +From c72f2b878b698ff168438d0349777835402d899e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 17:52:14 +1100 Subject: [PATCH] Fix packed ice generation diff --git a/CraftBukkit-Patches/0049-Watchdog-Thread.patch b/CraftBukkit-Patches/0049-Watchdog-Thread.patch index 6ae940c09f..8679695e46 100644 --- a/CraftBukkit-Patches/0049-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0049-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From 6e9323fac10fa52d12de38ee61b2aaccc1ff3bec Mon Sep 17 00:00:00 2001 +From f1b48127671f649c0a241fbbe94af76f14c37513 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 5 Aug 2014 17:20:19 +0100 Subject: [PATCH] Watchdog Thread. @@ -18,10 +18,10 @@ index 1e682e9..ae9e255 100644 thread1.setName("Server Watchdog"); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b7a8a4c..bcdd918 100644 +index c90cbcc..35e0a15 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -567,6 +567,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -563,6 +563,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.a(crashreport); } finally { try { @@ -29,7 +29,7 @@ index b7a8a4c..bcdd918 100644 this.isStopped = true; this.stop(); } catch (Throwable throwable1) { -@@ -667,6 +668,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -663,6 +664,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.methodProfiler.b(); this.methodProfiler.b(); diff --git a/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch index 6c5bec4951..f0230b46ab 100644 --- a/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch +++ b/CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch @@ -1,4 +1,4 @@ -From 5498542d2f34ab0718066833f973fb2b4f9de6b8 Mon Sep 17 00:00:00 2001 +From b92a3ea19ea40afe834c9a40a08ebf586dd628cb Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 3 Dec 2013 11:07:48 +1100 Subject: [PATCH] Clear Flower Pot on Drop diff --git a/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch index 6d09c3e372..f0499f047d 100644 --- a/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,4 +1,4 @@ -From d57ae577426a74a98f9b776aceffad9ae6297e9f Mon Sep 17 00:00:00 2001 +From 3705cb92a2a8adc06ea06c3688700b6979f76a41 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 2 Dec 2013 23:42:09 +0000 Subject: [PATCH] Fix some chunks not being sent to the client diff --git a/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch index 6527d1f503..ae57b16b8b 100644 --- a/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch @@ -1,4 +1,4 @@ -From add640221c6a7a23228de32c3147fb2f0daa4cbd Mon Sep 17 00:00:00 2001 +From 6c0fe93ff5ca68845ce1210546260ac5a27a7d97 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 5 Dec 2013 13:55:53 +1100 Subject: [PATCH] Fix Broken Async Chat diff --git a/CraftBukkit-Patches/0053-Orebfuscator.patch b/CraftBukkit-Patches/0053-Orebfuscator.patch index eedee25e43..43e52c7c8e 100644 --- a/CraftBukkit-Patches/0053-Orebfuscator.patch +++ b/CraftBukkit-Patches/0053-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 178ba754758e09c17d82ac88d52f0f86591f7142 Mon Sep 17 00:00:00 2001 +From afb5ac02e70cb648e6b2f3e0697f1be5b361775f Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -91,10 +91,10 @@ index 0301fba..7a84a95 100644 public void a(BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8fc5c71..a4fda33 100644 +index f32985f..c6ea886 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -494,6 +494,7 @@ public abstract class World implements IBlockAccess { +@@ -497,6 +497,7 @@ public abstract class World implements IBlockAccess { this.d(blockposition.up(), block); this.d(blockposition.north(), block); this.d(blockposition.south(), block); @@ -102,7 +102,7 @@ index 8fc5c71..a4fda33 100644 } public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) { -@@ -719,9 +720,16 @@ public abstract class World implements IBlockAccess { +@@ -722,9 +723,16 @@ public abstract class World implements IBlockAccess { return this.worldProvider.p()[this.getLightLevel(blockposition)]; } diff --git a/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch index d7740fd9e1..5bbffcd0c1 100644 --- a/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch +++ b/CraftBukkit-Patches/0054-Optimize-DataWatcher.patch @@ -1,4 +1,4 @@ -From 13c622659e5b7767c3240d9ab5f260252a5226b6 Mon Sep 17 00:00:00 2001 +From 1fb735ca7b041fe1720f77bf3dcdd5f3a09b59db Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:45:47 +1100 Subject: [PATCH] Optimize DataWatcher diff --git a/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch index c4711c27ff..531abb16ce 100644 --- a/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From 70a5f335afc7120e0a0ef56dbeb97b90fd0805e8 Mon Sep 17 00:00:00 2001 +From 788b2f3ba573ae071ff490d48bd8d8a923892452 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:32:10 +1100 Subject: [PATCH] Fire PreLogin Events in Offline Mode diff --git a/CraftBukkit-Patches/0056-BungeeCord-Support.patch b/CraftBukkit-Patches/0056-BungeeCord-Support.patch index 79768afdaa..e292593b94 100644 --- a/CraftBukkit-Patches/0056-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0056-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 5c24f2e31369f0c038b9fdde57327bd0e9c1f99c Mon Sep 17 00:00:00 2001 +From d4d3cba7e71f2f5f3580322b0a8596a178e24e68 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -45,7 +45,7 @@ index 8f421f3..727948a 100644 } break; diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 42905fd..3508f87 100644 +index 9bfb5a2..7410718 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -84,9 +84,24 @@ public class LoginListener implements PacketLoginInListener, IUpdatePlayerListBo @@ -117,7 +117,7 @@ index cc5aee0..18d0c6b 100644 this.d = EnumProtocol.a(packetdataserializer.e()); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f24739d..b674e67 100644 +index 7f3be50..770983e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -403,7 +403,7 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch index 8606c9a800..94c23882a1 100644 --- a/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From 96c4623c1ce960e00d9998d7c0fbeab9d9eaa10f Mon Sep 17 00:00:00 2001 +From 4bc32928aa415a3a9f949b45651f6f44c1450184 Mon Sep 17 00:00:00 2001 From: Dylan Xaldin Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression diff --git a/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch index 57f9978fd7..6b3bdd6d2d 100644 --- a/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From a52ed5af41b4f75024cbeba009eaa85aabc1e37b Mon Sep 17 00:00:00 2001 +From 60fc3efe1cfd4ab36f4407c1464324396e56b105 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:58:58 +1100 Subject: [PATCH] Configurable Amount of Netty Threads @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bcdd918..4c18e24 100644 +index 35e0a15..c8ba6ab 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -63,7 +63,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -27,7 +27,7 @@ index bcdd918..4c18e24 100644 this.Z = new UserCache(this, file1); this.b = this.h(); // this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init -@@ -1323,7 +1323,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -1319,7 +1319,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } // Spigot End public ServerConnection ap() { diff --git a/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch index fa6e4ad3c7..85aed02c87 100644 --- a/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From 975fbd6108019d07c966a3d2d6b1100794a54c20 Mon Sep 17 00:00:00 2001 +From 25da61d4064c2034de29dc150103669386f6d6dd Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 15:21:02 +1100 Subject: [PATCH] Prevent Mineshaft Saving diff --git a/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch index 21acc2c80a..8bfd739629 100644 --- a/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,14 +1,14 @@ -From 51d23beae4d968713dc6c8bdf2c7c41c470a333b Mon Sep 17 00:00:00 2001 +From 49600e0533984de5413e44aa5d3139a03885b664 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 18 Dec 2013 13:39:14 +1100 Subject: [PATCH] Log Cause of Unexpected Exceptions diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4c18e24..d57af9e 100644 +index c8ba6ab..70df1ad 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -548,6 +548,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -544,6 +544,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } } catch (Throwable throwable) { MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable); diff --git a/CraftBukkit-Patches/0061-Particle-API.patch b/CraftBukkit-Patches/0061-Particle-API.patch index ced952b6e9..3aca26960b 100644 --- a/CraftBukkit-Patches/0061-Particle-API.patch +++ b/CraftBukkit-Patches/0061-Particle-API.patch @@ -1,4 +1,4 @@ -From 113c3cdca3e582d522b1ff90f5a486b8092cc28d Mon Sep 17 00:00:00 2001 +From 46f2bc4a1fa7f46ab1b371eadb9629793ca2044e Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API diff --git a/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch index 01f804fff7..142be9d902 100644 --- a/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch @@ -1,4 +1,4 @@ -From 07ac2c012866680de5f9301196a037e5806bff2f Mon Sep 17 00:00:00 2001 +From 0096f0ac9e3453043f1a5892effd4b6446674b79 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Tue, 9 Jul 2013 00:11:12 +0200 Subject: [PATCH] Save ticks lived to nbttag diff --git a/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch index 0dd987a6f6..593e08d8fc 100644 --- a/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch @@ -1,14 +1,14 @@ -From 162e0a05ba706a962485f55cb36cd998a9446cd1 Mon Sep 17 00:00:00 2001 +From 167ef06dcd77a658fd9994a2ce5c0a4a2602aea8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 12:17:37 +1000 Subject: [PATCH] More Efficient GetCubes diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a4fda33..974fe77 100644 +index c6ea886..9be6fb7 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1101,28 +1101,56 @@ public abstract class World implements IBlockAccess { +@@ -1104,28 +1104,56 @@ public abstract class World implements IBlockAccess { IBlockData iblockdata = Blocks.STONE.getBlockData(); BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); diff --git a/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index e2eb3eae24..c0cb6e7abc 100644 --- a/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From 4bb35602ee6638ad0778370e8b8f97c210469400 Mon Sep 17 00:00:00 2001 +From 3d513e57a5dd66a39850efe2546955cd88ba75b1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's diff --git a/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch index eb53d1a4f5..a00896afdb 100644 --- a/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From 75a2543c83ce99ca4c1b60a45c6caca5d604adeb Mon Sep 17 00:00:00 2001 +From 6ce3b23df3047f1498c060cfd075fe5ee4f5f242 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 14:07:41 +1100 Subject: [PATCH] Warn if PermGen may be insufficient diff --git a/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch index 9220b9946c..149da87524 100644 --- a/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch @@ -1,4 +1,4 @@ -From dcf83e0337de967e36ed1e2a028c4a976d26c1f6 Mon Sep 17 00:00:00 2001 +From eea3f50b6920d99524565206a10a4c9dd3cebba2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 15:57:57 +1100 Subject: [PATCH] Disable Connected Check on setScoreboard diff --git a/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch index f4103b8285..79867c77df 100644 --- a/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From 325f69316cc1566252e7b178f281d36ec5fb65e0 Mon Sep 17 00:00:00 2001 +From 47821af90f75fed72ed71e8e203b435c216e93b4 Mon Sep 17 00:00:00 2001 From: slide23 Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option diff --git a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch index 52bbe70ab4..32e3cefedb 100644 --- a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch @@ -1,4 +1,4 @@ -From 5428d854f3be41d9a03048775e572f867464cab0 Mon Sep 17 00:00:00 2001 +From c693eb08f9beb8d2cdc5c66a8c71e60b999ebf34 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 7 Jan 2014 15:56:26 +0000 Subject: [PATCH] Allow statistics to be disabled/forced diff --git a/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch index d9eb42e1a4..376a9f4286 100644 --- a/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch @@ -1,4 +1,4 @@ -From fc35ee9742d0f9352ad14e2345eeb2fe342205a7 Mon Sep 17 00:00:00 2001 +From 84daed6644e5628abf26b64f6e670e7f18297ced Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 10 Jan 2014 15:15:50 +1100 Subject: [PATCH] Fix ItemStack Unbreakable Code diff --git a/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch index 44a439ee7c..8a122dcd2b 100644 --- a/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0070-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,14 +1,14 @@ -From 9489a7b68288b5b2c19bc3ab0418ed17df89c17b Mon Sep 17 00:00:00 2001 +From dec506f2dafe576c4a20a17a0133fad16d86a3b6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 20:56:41 +1100 Subject: [PATCH] Try and Debug Crash Reports Crashing diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d57af9e..1fe3014 100644 +index 70df1ad..d2c4e6f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -743,7 +743,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -739,7 +739,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs worldserver.doTick(); worldserver.timings.doTick.stopTiming(); // Spigot } catch (Throwable throwable) { @@ -22,7 +22,7 @@ index d57af9e..1fe3014 100644 worldserver.a(crashreport); throw new ReportedException(crashreport); } -@@ -753,7 +759,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -749,7 +755,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs worldserver.tickEntities(); worldserver.timings.tickEntities.stopTiming(); // Spigot } catch (Throwable throwable1) { diff --git a/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch index 481dbd3e4c..1d6b1a923e 100644 --- a/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 1eb61c31c972d2eeb44c69d3fe3d889cc470c933 Mon Sep 17 00:00:00 2001 +From 2b6bdb57c6ac9923c2c1fca0085c8963571c308d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Improve AutoSave Mechanism @@ -24,10 +24,10 @@ index b2ce05f..a59ff8e 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1fe3014..fbd9b4e 100644 +index d2c4e6f..4784bbc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -655,7 +655,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -651,7 +651,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs SpigotTimings.worldSaveTimer.startTiming(); // Spigot this.methodProfiler.a("save"); this.v.savePlayers(); diff --git a/CraftBukkit-Patches/0072-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0072-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index 35f1154a88..ecfdeaf601 100644 --- a/CraftBukkit-Patches/0072-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 289d597d3a8ae0d0e35fac45c701e4c636baa461 Mon Sep 17 00:00:00 2001 +From ec1f9295415c99a03bde0e1d5d41221d2d8ab6db 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/0073-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0073-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index 6ca34b99cf..f75cfaa9b8 100644 --- a/CraftBukkit-Patches/0073-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 d9bd763503896640fe63b1654de83d47c3ef7bb2 Mon Sep 17 00:00:00 2001 +From fe1565b904440fd4a243cba36b8e27a93e7daf0d 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/0074-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch index 192a79400b..034fab8a75 100644 --- a/CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0074-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From fdcb23ae30c7e144baba75b1ea021186943d4bf6 Mon Sep 17 00:00:00 2001 +From c14e5399d69c0a22323d617fd178058f0654612a 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fbd9b4e..c831ce3 100644 +index 4784bbc..fe7a573 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -120,6 +120,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -21,7 +21,7 @@ index fbd9b4e..c831ce3 100644 public MinecraftServer(OptionSet options, Proxy proxy, File file1) { this.e = proxy; -@@ -501,6 +507,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -497,6 +503,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.isRunning = false; } @@ -35,7 +35,7 @@ index fbd9b4e..c831ce3 100644 public void run() { try { if (this.init()) { -@@ -511,38 +524,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -507,38 +520,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs this.r.setServerInfo(new ServerPing.ServerData("1.8.3", 47)); this.a(this.r); diff --git a/CraftBukkit-Patches/0075-Add-Spigot-Links.patch b/CraftBukkit-Patches/0075-Add-Spigot-Links.patch index 913b9f7242..b203834cb7 100644 --- a/CraftBukkit-Patches/0075-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0075-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 28faf58f9ce67f8ea804ed5c38954b51d81542bc Mon Sep 17 00:00:00 2001 +From 2f726963845e79774e164ae20e9bbde6c7a88a96 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/0076-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch index fb4f63960f..f6a243da18 100644 --- a/CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0076-Configurable-Ping-Sample-Size.patch @@ -1,4 +1,4 @@ -From 02cbdc383eccf55a0263cfd0052d013ff55f831c Mon Sep 17 00:00:00 2001 +From e1d335a142a0f7a5b337250ec7bd4c4234a639a4 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/0077-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch index 11a2623825..23002cc285 100644 --- a/CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0077-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 6af0da4859d4348adc3ac9e36f3c84f0df0d29df Mon Sep 17 00:00:00 2001 +From c2148db1bb996d981b2adb0c74af5d83ff08a1ab 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/0078-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch index 46977cf617..d3c7553bbe 100644 --- a/CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0078-Allow-Configuring-Chunks-per-Packet.patch @@ -1,4 +1,4 @@ -From 8b80b654e0ea8885fc8b98db6eac1023caaca109 Mon Sep 17 00:00:00 2001 +From 614cd119fb75a143a241b001669c3a96252f2965 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/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch index b902e47655..683557bf24 100644 --- a/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 6731885bf6ad51d1aebc132eabc69c05ce7aca48 Mon Sep 17 00:00:00 2001 +From 379aec6a9bc3df21f137c29e27d2e29095440363 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/CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch index 36deb62c1b..116b254628 100644 --- a/CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 4bae06e72ab3132d8ae68b93f9616c7c7d12cc11 Mon Sep 17 00:00:00 2001 +From f127136ce1a859eaeb80af85368f44ed0f722a47 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/0081-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0081-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index 152e0bd7d8..884f6bd0d4 100644 --- a/CraftBukkit-Patches/0081-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 d36dcb2ae4108a697242904dff0741f918ad4c69 Mon Sep 17 00:00:00 2001 +From e11e1f8a3f9895c53f5b1398f7bbe9e9b46dc3cc 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/0082-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch index 6f761c565f..67a8f690b7 100644 --- a/CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0082-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From 89f01f61bc5dd98b3435de3aaaa717cd0680c9b4 Mon Sep 17 00:00:00 2001 +From c8c347b143db9269c2434ceb784074ef08245b73 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/0083-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch index 0521793d86..b813fb7e8f 100644 --- a/CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0083-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 864fe313d03905e3cb0f660fc02b1a6d53b504c0 Mon Sep 17 00:00:00 2001 +From 7f4e8da216347a9898f4e16ebc0d87bdbb6580d7 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/0084-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch index a6e61cbc46..04ac1276d5 100644 --- a/CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 221131d48bf4531fa60cde7877e9ff5f6e5b1939 Mon Sep 17 00:00:00 2001 +From 360183ffef7a5121e9d0f092bfe2f5adaf3dca9f 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/CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch index 5fdc116349..a65195aa5f 100644 --- a/CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0085-Allow-Disabling-Creative-Item-Filter.patch @@ -1,4 +1,4 @@ -From 9a9500938f601950f1d64ba0248ebb661f2445cd Mon Sep 17 00:00:00 2001 +From 219bd2dcb4d9abb2a72b86382ed9cf62245b42a8 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/0086-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch index 311830996b..4905700a90 100644 --- a/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From e6ce2e83cdc2491641c200c1f860b029fb59bb42 Mon Sep 17 00:00:00 2001 +From cb296e6d330ed96099e0a1e1ae63de9d3a8a5f9c 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/CraftBukkit-Patches/0087-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 index 83a6175390..df0cc5378c 100644 --- a/CraftBukkit-Patches/0087-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,4 +1,4 @@ -From 5592d63ffecfc0badf3c17d5863cfa2dc87ffa88 Mon Sep 17 00:00:00 2001 +From 8a0f526044f3a60146d7ea41cc472d8244acfeb2 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/CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch index 57b290bb49..35f70b3398 100644 --- a/CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0088-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From 81df68f800f262fe65c108319400ec47b91d9c40 Mon Sep 17 00:00:00 2001 +From 821df7abccb2676bf0af3461590833d7c7187f8a 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/0089-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch index d219d4c84c..edb4dcf95e 100644 --- a/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 4c6fabefb7e61513178c4d93e46d3c5b58434030 Mon Sep 17 00:00:00 2001 +From 2ce08844e365ba6c3c071e72ff416c395544f160 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API diff --git a/CraftBukkit-Patches/0090-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0090-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 532813b533..75c0efb336 100644 --- a/CraftBukkit-Patches/0090-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 768bcde3e79b42a77e37ad7b26ab497e0bc12762 Mon Sep 17 00:00:00 2001 +From c541ebf3c597a6e6e39bb41a7b6855c5e955a240 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/0091-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch index 13b24bf789..8ecf7eee62 100644 --- a/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 61bbf0df8768aaf437b957eb136ea27f9f083090 Mon Sep 17 00:00:00 2001 +From d9513bec77e7242331a32c4e6170e2c4d65fbc3f 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/0092-Guard-Entity-List.patch b/CraftBukkit-Patches/0092-Guard-Entity-List.patch index 2f5ae8553a..da41738570 100644 --- a/CraftBukkit-Patches/0092-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0092-Guard-Entity-List.patch @@ -1,11 +1,11 @@ -From 3686a1f9bc04251600256dd63e5c90c891cddca6 Mon Sep 17 00:00:00 2001 +From c2d7f1c3f6c33ff4c092d949d0d518501d3a0a75 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 974fe77..2ea78c2 100644 +index 9be6fb7..0d97f71 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -34,7 +34,32 @@ public abstract class World implements IBlockAccess { @@ -50,7 +50,7 @@ index 974fe77..2ea78c2 100644 protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList; protected float growthOdds = 100; protected float modifiedOdds = 100; -@@ -1341,6 +1367,7 @@ public abstract class World implements IBlockAccess { +@@ -1344,6 +1370,7 @@ public abstract class World implements IBlockAccess { org.spigotmc.ActivationRange.activateEntities(this); // Spigot timings.entityTick.startTiming(); // Spigot @@ -58,7 +58,7 @@ index 974fe77..2ea78c2 100644 // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { entity = (Entity) this.entityList.get(this.tickPosition); -@@ -1377,12 +1404,15 @@ public abstract class World implements IBlockAccess { +@@ -1380,12 +1407,15 @@ public abstract class World implements IBlockAccess { this.getChunkAt(j, k).b(entity); } diff --git a/CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch index 1353294862..5c36601519 100644 --- a/CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0093-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 74a9ae442876b923afc2ffee51d06900fc15f166 Mon Sep 17 00:00:00 2001 +From cae0937ade50fb86203d217e6163cd57fa303626 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 @@ -6,10 +6,10 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2ea78c2..57fda56 100644 +index 0d97f71..e7af966 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1090,6 +1090,7 @@ public abstract class World implements IBlockAccess { +@@ -1093,6 +1093,7 @@ public abstract class World implements IBlockAccess { this.everyoneSleeping(); } @@ -17,7 +17,7 @@ index 2ea78c2..57fda56 100644 int i = entity.ae; int j = entity.ag; -@@ -1106,6 +1107,7 @@ public abstract class World implements IBlockAccess { +@@ -1109,6 +1110,7 @@ public abstract class World implements IBlockAccess { this.entityList.remove(index); } // CraftBukkit end diff --git a/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch index 385f974bb1..2bdd281c69 100644 --- a/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From f6f9ff67f4e3210480843d9d2a3a7e5c74fca239 Mon Sep 17 00:00:00 2001 +From dfe4085a8299515b4699fa2d3dcd888e68aed2cd 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/0095-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch index b182df8973..2c086a629f 100644 --- a/CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0095-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 5366ec74774f139c46dc97f76cedabcf60753a10 Mon Sep 17 00:00:00 2001 +From 6af2a4bcda059563d6d5eeb1d07368c7a41e6627 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/0096-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0096-Configurable-dragon-death-and-wither-spawn-sounds.patch index 79040340de..8c087383b9 100644 --- a/CraftBukkit-Patches/0096-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0096-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,11 +1,11 @@ -From 2516216206c3330ccc1057fe4e9bcc11e9fd2760 Mon Sep 17 00:00:00 2001 +From c09aaa20343e1e6104f8c84f928d993fba0a1ddc 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/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 253e60b..2b038e0 100644 +index 9dec38a..4bdcfc6 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -578,6 +578,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo @@ -17,7 +17,7 @@ index 253e60b..2b038e0 100644 double deltaLength = Math.sqrt(distanceSquared); double relativeX = player.locX + (deltaX / deltaLength) * viewDistance; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 2816af1..d904a3f 100644 +index ec19fef..779029c 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -191,6 +191,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { diff --git a/CraftBukkit-Patches/0097-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0097-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 81493186ab..fec8423dbf 100644 --- a/CraftBukkit-Patches/0097-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 98a6c5b5dc1486fe21610b16ae5e0fea70c6d67e Mon Sep 17 00:00:00 2001 +From 1da6fd50c5d7ca55b6b1c10dd38c3fdf166aeafc 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 @@ -6,10 +6,10 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a5cca2b..b2ad2ca 100644 +index fe7a573..f5efbed 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1015,7 +1015,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -1011,7 +1011,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } public String getServerModName() { diff --git a/CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch index 73443c4698..6b5395e8f8 100644 --- a/CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0098-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From b505768f38abdcb3d062cd825ebb4ec02422a002 Mon Sep 17 00:00:00 2001 +From 7f2d4ef06d3b96604f1eeb7582b80384bace9fbf 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/0099-Add-Conversion-Message.patch b/CraftBukkit-Patches/0099-Add-Conversion-Message.patch index ae29d1134b..1164838bca 100644 --- a/CraftBukkit-Patches/0099-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0099-Add-Conversion-Message.patch @@ -1,4 +1,4 @@ -From bcfef4b5882636b74d1535d0bb40df88f4e8bc1f Mon Sep 17 00:00:00 2001 +From b45fe5a471d69ad3aa6dc76232cc45cbf31b0b41 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/0100-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0100-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index 208738657f..e75bece48d 100644 --- a/CraftBukkit-Patches/0100-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 2f62f2f27a069a33ffdea27c32ad77d41a45b4a1 Mon Sep 17 00:00:00 2001 +From 592c9a0cfe6d65ee1a8651a5a437224275f9ccb2 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/0101-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch index 35fcb5503b..618daab2b3 100644 --- a/CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0101-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From 7bff30bb6fb6973f318d5108010fd39c2089ce91 Mon Sep 17 00:00:00 2001 +From f63d93d7b87d31a515daf4af9e03b7a8629a01bc 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/0102-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0102-Use-Offline-Player-Data-Once-if-Required.patch index 5a1d4c9501..d9f2a9be47 100644 --- a/CraftBukkit-Patches/0102-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 50e1322dc295a6c10cb28bd67b4fff85f00af049 Mon Sep 17 00:00:00 2001 +From fefbcbab138009b23a6bf5c9d539e885ba7fa5f6 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/0103-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0103-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index 8ba7d9073a..ae5962c1aa 100644 --- a/CraftBukkit-Patches/0103-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 404d65b51927004f42484ecb86398567bc9b2e92 Mon Sep 17 00:00:00 2001 +From 1692d8893b9f8156fc944e33d1dddb6a09806944 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/0104-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch index 54241470ff..c54c6c39d5 100644 --- a/CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From c94603d9db9bc4f01a22597e35f3ef63319544b3 Mon Sep 17 00:00:00 2001 +From 42b2fdff525e74446b04ff994dd86f2899e27953 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/0105-Fix-Player-Banning.patch b/CraftBukkit-Patches/0105-Fix-Player-Banning.patch index 0bd7eab956..463755b99b 100644 --- a/CraftBukkit-Patches/0105-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0105-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 87e3af6c9cc92d97990213263d3dbb59251aa01f Mon Sep 17 00:00:00 2001 +From 397c13bf58c330bf25ce3d64bc557acd4022401f 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/0106-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch index 3e07514b8d..b3253d2cd5 100644 --- a/CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0106-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From 2681120997c3cbbfd9b53ba0d1cb3170d9f03895 Mon Sep 17 00:00:00 2001 +From a2b80a25ca363628c91f0504daef09106cf5267a 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/0107-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch index 775c6c5020..dc43b12336 100644 --- a/CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0107-Correct-Ban-Expiration.patch @@ -1,11 +1,11 @@ -From cb0a96fafe85d1aee8c6e911db08f72e11b80ee8 Mon Sep 17 00:00:00 2001 +From 1c1a2d5fee02064e136f22f6c8e8a7021539fe03 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 b674e67..ec04782 100644 +index 770983e..44a4779 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -415,7 +415,7 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch index 4e2b526fc8..d4cc350576 100644 --- a/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0108-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From 619a7bb400d731c06a62f5d8b0341fb7a2bf38ba Mon Sep 17 00:00:00 2001 +From 0a80ce27e21076db3864895bcc265dc7360e2de4 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 diff --git a/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch index 36332c40ea..b3c0470b5b 100644 --- a/CraftBukkit-Patches/0109-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 008bf408d502227c1979f95c858ee21b41bae6cc Mon Sep 17 00:00:00 2001 +From 4df38ad306a143c3dcd13e4ee6d0151d39499e96 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/0110-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch index 1e292c886b..b14b2e579c 100644 --- a/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From cc614301122f7255fe7d3e4e1d6fe7a46d55d176 Mon Sep 17 00:00:00 2001 +From 59fc7673ad4e049459e2280f7d7620d059b2ace0 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/0111-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch index 3b0d187fde..e533175334 100644 --- a/CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0111-Log-null-TileEntity-Owner.patch @@ -1,4 +1,4 @@ -From d79b0d59a35cf78aae1efe9164bb19f6ba4220c6 Mon Sep 17 00:00:00 2001 +From 992aa799cc060b43e0e7cb0a75caa0de2be81808 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/0112-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0112-Don-t-special-case-invalid-usernames-for-UUIDs.patch index 5a286fca22..b738c9c395 100644 --- a/CraftBukkit-Patches/0112-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 239050cc5a4688f0903096e36ab503e25bb58379 Mon Sep 17 00:00:00 2001 +From d2606a4434db48256165f4880b9e2a1aa9a0b011 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/0113-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch index 6e1b319e1f..e9dffbf24f 100644 --- a/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From 8b5f1370d8b8d7c5918edc9dfb3f0ea9d0458da3 Mon Sep 17 00:00:00 2001 +From 0828c4d57312260a6789176c025caa5e83c8991d Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 20 Apr 2014 13:18:55 +0100 Subject: [PATCH] Convert player skulls async diff --git a/CraftBukkit-Patches/0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 3b96c87432..4c98ad4d8a 100644 --- a/CraftBukkit-Patches/0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0114-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,11 +1,11 @@ -From 3787870d572aaa638ccb121abf584ebe424b6740 Mon Sep 17 00:00:00 2001 +From dc56c6e054e61c77a698c09b7e39adcd5031ab01 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 57fda56..d58733c 100644 +index e7af966..20bad35 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -132,6 +132,8 @@ public abstract class World implements IBlockAccess { @@ -17,7 +17,7 @@ index 57fda56..d58733c 100644 public static long chunkToKey(int x, int z) { -@@ -567,6 +569,9 @@ public abstract class World implements IBlockAccess { +@@ -570,6 +572,9 @@ public abstract class World implements IBlockAccess { } // CraftBukkit end iblockdata.getBlock().doPhysics(this, blockposition, iblockdata, block); diff --git a/CraftBukkit-Patches/0115-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0115-Check-Skull-canPlace.patch index f75d57790e..293b0f328c 100644 --- a/CraftBukkit-Patches/0115-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0115-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 9759ce95b64c079fd6ef4dde813b388a12b5db1f Mon Sep 17 00:00:00 2001 +From 7c21aaa490e61d1a7d9767ed034580d02fc623ab 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/0116-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0116-Fix-race-condition-that-could-kill-connections-befor.patch index d24cd749e3..1ebfbe0ac0 100644 --- a/CraftBukkit-Patches/0116-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0116-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From b23cad30d0407c9247cf6327724aa31bc737d92b Mon Sep 17 00:00:00 2001 +From 12c1f896e9b4462dd7a29164b610a0885db8fc68 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/0117-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0117-Configurable-UserCache-cap.patch index 2f4452cf87..5a59cd99b8 100644 --- a/CraftBukkit-Patches/0117-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0117-Configurable-UserCache-cap.patch @@ -1,4 +1,4 @@ -From 11723e0f84ef387eaac92bf5b42b1ca7d3913c2d Mon Sep 17 00:00:00 2001 +From 07309f78b130526491277a7637e8af6e22b0de26 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/0118-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0118-Implement-PlayerSpawnLocationEvent.patch index 2cbe331f39..ae16def2e2 100644 --- a/CraftBukkit-Patches/0118-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0118-Implement-PlayerSpawnLocationEvent.patch @@ -1,11 +1,11 @@ -From ddad815e80fb11b16f7974d295cff9b447a56d0a Mon Sep 17 00:00:00 2001 +From 3ee79ffb38f692b1e30f7422da16a6c9bda5af52 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 ec04782..73125d6 100644 +index 44a4779..c7d26ce 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/0119-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0119-Cap-Objective-Score-Length.patch index 71b8a75802..9fe8cff6ab 100644 --- a/CraftBukkit-Patches/0119-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0119-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From eca4acdd7c20fe188f6c529b7d6b44880e1fbe5d Mon Sep 17 00:00:00 2001 +From ad2f640f009d97ecca2946e50798a113a41a0608 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/0120-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0120-Process-conversation-input-on-the-main-thread.-Fixes.patch index 577d399c27..ac02f04e7c 100644 --- a/CraftBukkit-Patches/0120-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0120-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From ac214b4a500a1c74b995618d0b685d74f486fc26 Mon Sep 17 00:00:00 2001 +From d343c83bea60fb9f8a5801682fa3d9d96a4c5ced 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/0121-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0121-Configurable-save-on-stop-only-for-UserCache.patch index 34fcd9b0ed..750ff30387 100644 --- a/CraftBukkit-Patches/0121-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0121-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,14 +1,14 @@ -From 72323216aad70986d8456e4ee8812d1f2c9498bd Mon Sep 17 00:00:00 2001 +From 11c29debeb295c9e8076493694edc15c62668ad1 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/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b2ad2ca..6a12218 100644 +index f5efbed..36221b6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -487,7 +487,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -483,7 +483,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs if (this.n.d()) { this.n.e(); } diff --git a/CraftBukkit-Patches/0122-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0122-Prevent-Unbounded-IntCache-Growth.patch index a94fa1695e..1e46c99470 100644 --- a/CraftBukkit-Patches/0122-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0122-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From d28e2e9836162bbbe0e17f3f7ef4e5f90fc4e913 Mon Sep 17 00:00:00 2001 +From d20ccbd2b2d81c2f60bb5ca0a78d23c8a20ac988 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/0123-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0123-Add-damager-to-the-unhandled-error.patch index e04eaf8258..c4f184b1c9 100644 --- a/CraftBukkit-Patches/0123-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0123-Add-damager-to-the-unhandled-error.patch @@ -1,4 +1,4 @@ -From ea91ea574fdd47829f89f60fd8a42d48bdfc076e Mon Sep 17 00:00:00 2001 +From 2e5e41d1d6b2b7df9d016fa1a3d3942ac3775f65 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/CraftBukkit-Patches/0124-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0124-Cross-World-Entity-Teleportation.patch index 09f64e514e..c21f7954ad 100644 --- a/CraftBukkit-Patches/0124-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0124-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From d70688f3341c1b2ba7d359979958e38c13429bed Mon Sep 17 00:00:00 2001 +From 9cbd3449354d14efe8225c0a3c87e6342ba89d96 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/0125-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch index 9e5e22da11..de4fcd06b5 100644 --- a/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0125-Limit-block-placement-interaction-packets.patch @@ -1,4 +1,4 @@ -From 0796f6c3aa958b2d0694a97e1a1ed1561e327229 Mon Sep 17 00:00:00 2001 +From 60bb367ecd43ae6099214c05bca623be2088ff5e 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/0126-Better-item-validation.patch b/CraftBukkit-Patches/0126-Better-item-validation.patch index dd8d62f666..bcd468d06c 100644 --- a/CraftBukkit-Patches/0126-Better-item-validation.patch +++ b/CraftBukkit-Patches/0126-Better-item-validation.patch @@ -1,4 +1,4 @@ -From fc74cbedbc1ea5dd4487d13d840a7407438c0a3e Mon Sep 17 00:00:00 2001 +From 42df9e8c236f49c9ce63b62876e8f5dbb471d4e3 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/0127-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0127-Further-Seed-Customisation.patch index d404280659..95acd77ea0 100644 --- a/CraftBukkit-Patches/0127-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0127-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From 0fdac732c8b420d01452e9e997179c5e2e961ec3 Mon Sep 17 00:00:00 2001 +From 28e19245cfe6adcdd820b9ded79a6c7e94d69b30 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/0128-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0128-Disable-ResourceLeakDetector.patch index 03d2c5b240..9fd2cf703b 100644 --- a/CraftBukkit-Patches/0128-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0128-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From 38c28506adb08d8a1e01796e4049c15345aace31 Mon Sep 17 00:00:00 2001 +From ed8432437c0d0480e61f87a832857557a5b098a7 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 6a12218..f304df2 100644 +index 36221b6..e211647 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -128,6 +128,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0129-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0129-Add-More-Information-to-session.lock-Errors.patch index 0b404cc819..927247cf03 100644 --- a/CraftBukkit-Patches/0129-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0129-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From e67d72c182033ac7ef74f1b2a9a110de05ead1bb Mon Sep 17 00:00:00 2001 +From 2227fdb16b18bcb7af2705340f7043bca98e3794 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/0130-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0130-Safer-JSON-Loading.patch index 49faecac52..ac9d149deb 100644 --- a/CraftBukkit-Patches/0130-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0130-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From 60c5b248fea86d0f654cb9bf791e4ca2c96a00fb Mon Sep 17 00:00:00 2001 +From fd7c98461352a631cc53cfa5b8d91c501c9f5d2d 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/0131-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0131-Fix-Slow-Loading-Libraries.patch index 16def596b5..c7023de2c9 100644 --- a/CraftBukkit-Patches/0131-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0131-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From f419a5e94b6b3b91698d9e1c7a672e5ad61b2537 Mon Sep 17 00:00:00 2001 +From e2b0a7ee7f0bec5b793df6600fef82e299147a5e 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" diff --git a/CraftBukkit-Patches/0132-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0132-Add-CommandLine-EULA-Flag.patch index 6aeb695d32..c66c09283f 100644 --- a/CraftBukkit-Patches/0132-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0132-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From 3578fae39b7e99cad33c5818f3a2f30fe70c8dda Mon Sep 17 00:00:00 2001 +From 5f01b62a63aa937f06ce05318c5352f68be6594c 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/0133-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0133-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index 522eeaa95a..6808451d50 100644 --- a/CraftBukkit-Patches/0133-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0133-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From 232cb66228907df78c48e490ede6871f1126a698 Mon Sep 17 00:00:00 2001 +From a9c3ad3a6b8be2e6865599f093fdca05a7b6795a 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/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index b75181c7e8..f4ff65aed4 100644 --- a/CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From e49b1f18add025965d8ae050ca3cb0f10fa03810 Mon Sep 17 00:00:00 2001 +From 7209330109badd45503997b21d6b3807d7c3a0f2 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 diff --git a/CraftBukkit-Patches/0135-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0135-Prevent-a-crash-involving-attributes.patch index b31eec8b1f..5e559a5c24 100644 --- a/CraftBukkit-Patches/0135-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0135-Prevent-a-crash-involving-attributes.patch @@ -1,4 +1,4 @@ -From 5552267fb01985244e4a5d5a0cb8a3e0f079b587 Mon Sep 17 00:00:00 2001 +From ee6c77cc0f0efe3c175b454e830c1cc123310fff 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/CraftBukkit-Patches/0136-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0136-Make-moved-wrongly-limit-configurable.patch index cb5d2ac590..f540e89fc1 100644 --- a/CraftBukkit-Patches/0136-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0136-Make-moved-wrongly-limit-configurable.patch @@ -1,4 +1,4 @@ -From 63cb2ce21992c3b45ac935e9857d908905ff5772 Mon Sep 17 00:00:00 2001 +From 03b75ce178b9997862c4d2c31cb506d5665ec0ed 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/CraftBukkit-Patches/0137-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0137-Fix-Null-Tile-Entity-Worlds.patch index 913258ba4a..54e98ad274 100644 --- a/CraftBukkit-Patches/0137-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0137-Fix-Null-Tile-Entity-Worlds.patch @@ -1,14 +1,14 @@ -From 70464635b3bfc6a45e9362197c793c797c1f5cc4 Mon Sep 17 00:00:00 2001 +From 808595e3295e577837ed66d03cdb3b2f23b2ecaf 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d58733c..2d323a9 100644 +index 20bad35..1d1b5bf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1927,6 +1927,7 @@ public abstract class World implements IBlockAccess { +@@ -1930,6 +1930,7 @@ public abstract class World implements IBlockAccess { } } diff --git a/CraftBukkit-Patches/0138-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0138-Make-moved-too-quickly-limit-configurable.patch index 7f071cc60e..c9fe347b3b 100644 --- a/CraftBukkit-Patches/0138-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0138-Make-moved-too-quickly-limit-configurable.patch @@ -1,4 +1,4 @@ -From 2faeafd3fcc78777f16617fc147b7b4bc95b2530 Mon Sep 17 00:00:00 2001 +From 3c7025b272d89775ff08c4458439f596138931a1 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/CraftBukkit-Patches/0139-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0139-Apply-NBTReadLimiter-to-more-things.patch index ff7b62a127..80a4223972 100644 --- a/CraftBukkit-Patches/0139-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0139-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From 1ed3295f62dfe540fe78d8cdca156dfbc62ba578 Mon Sep 17 00:00:00 2001 +From b8980e7cbadd6e7cc867503481c28976a42e4420 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/0140-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0140-Allow-Attribute-Capping.patch index e792041973..97774a93b6 100644 --- a/CraftBukkit-Patches/0140-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0140-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From d95610eff21b6028efc825fcbe11798abfbfe965 Mon Sep 17 00:00:00 2001 +From 454e1450ea666c5e5d7207eda15709c4e22a013e 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/0141-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0141-Only-fetch-an-online-UUID-in-online-mode.patch index eb39116170..0f57f91e49 100644 --- a/CraftBukkit-Patches/0141-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0141-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 603647b6c7abd267dc71b2ea4f774979edcba13b Mon Sep 17 00:00:00 2001 +From 29e94edca913893712ff493090269bca641dcba1 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/0142-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0142-Filter-attribute-modifiers-which-cause-the-attribute.patch index 534637262c..fcc34b0c70 100644 --- a/CraftBukkit-Patches/0142-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0142-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From c27b1d0d1fffd9a9ba4a4941be8d9306b939ea42 Mon Sep 17 00:00:00 2001 +From f5aa4d723af8a14a41081a3b916fc0798507e0c2 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/0143-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0143-Plug-WorldMap-Memory-Leak.patch index 2fa954701e..79c7ca40e6 100644 --- a/CraftBukkit-Patches/0143-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0143-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From efdacf4c59df0306189d4b0d9c9f81e2b9c15841 Mon Sep 17 00:00:00 2001 +From 23de8ceb07e9c88986f2fbf1db4bc2bd5d5ae0d6 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 @@ -18,10 +18,10 @@ index 4b8d548..451f481 100644 public PersistentCollection(IDataManager idatamanager) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 2d323a9..1e03e19 100644 +index 1d1b5bf..1f41281 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1081,6 +1081,23 @@ public abstract class World implements IBlockAccess { +@@ -1084,6 +1084,23 @@ public abstract class World implements IBlockAccess { entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); diff --git a/CraftBukkit-Patches/0144-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0144-Fix-Corrupted-Trapped-Chest.patch index baf48dd591..5f9d1f9797 100644 --- a/CraftBukkit-Patches/0144-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0144-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From 8847d9167368c6536609a0bfad76e1bd1b46613a Mon Sep 17 00:00:00 2001 +From d52a65408226de421ff596dbeaea6c9fdd5d2db5 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 af4a551..6438c66 100644 +index cd07095..05d9f12 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -113,7 +113,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0145-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0145-Remove-uneeded-validation.patch index e90c89fd04..a8d4efade7 100644 --- a/CraftBukkit-Patches/0145-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0145-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From a37287fe726437bc2eb3fe6922d6b331d8442e74 Mon Sep 17 00:00:00 2001 +From 69c09ff76054402fcfe17ef93f386f7785eaf567 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/0146-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0146-Add-Hunger-Config-Values.patch index f962238512..7f06fe41ab 100644 --- a/CraftBukkit-Patches/0146-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0146-Add-Hunger-Config-Values.patch @@ -1,4 +1,4 @@ -From 70d25cc0672928042930789bd318ba3ab9bc70d5 Mon Sep 17 00:00:00 2001 +From ca84e6d45f65db6007045b897e7585d7fd6bd7bd 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/CraftBukkit-Patches/0147-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0147-Make-debug-logging-togglable.patch index 442dae5c10..88e643b2e6 100644 --- a/CraftBukkit-Patches/0147-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0147-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From 4085dc2656953fefa184a2dc439c16e93ab611dd Mon Sep 17 00:00:00 2001 +From 168bd904ebe1a2b34c2e3805feccdc5c6e086943 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/0148-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0148-Skip-invalid-enchants-in-CraftMetaItem.patch index a51dcd9c32..c6fe079993 100644 --- a/CraftBukkit-Patches/0148-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0148-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From 361c1d7528dabf6e01cf8ad66fce2b6b48b01fd8 Mon Sep 17 00:00:00 2001 +From ebae45585337bbf10983356371c04728b8045d48 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/0149-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0149-Limit-TNT-Detonations-per-tick.patch index b33bcc44c6..b056d232fa 100644 --- a/CraftBukkit-Patches/0149-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0149-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From aeedbb3daa60164b9ed25ee1d800a91d17a92ba4 Mon Sep 17 00:00:00 2001 +From 915ab51c5b998c76abe78ccb515cabc5ed108166 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 10f6e47..2d22327 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 6438c66..1b26492 100644 +index 05d9f12..22e4b10 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -582,6 +582,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0150-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0150-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index a5213b3b07..d6f6863c8a 100644 --- a/CraftBukkit-Patches/0150-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0150-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 0e3d4a614635c38e0ed14bdf80a715cef7610756 Mon Sep 17 00:00:00 2001 +From 007b98ca7f76e4ee3ae50ccf440b7d6f948eeb8d 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/0151-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0151-Configurable-Hanging-Tick.patch index de8bb9e286..84c6900eb4 100644 --- a/CraftBukkit-Patches/0151-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0151-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From fb716254b4919696ab4db97717f208cb169088c5 Mon Sep 17 00:00:00 2001 +From 69b8a0dc22ddf9502464813bc6ded7d2c6817e72 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/0152-Fix-Some-Memory-Leaks.patch b/CraftBukkit-Patches/0152-Fix-Some-Memory-Leaks.patch index c22071dea1..d188812994 100644 --- a/CraftBukkit-Patches/0152-Fix-Some-Memory-Leaks.patch +++ b/CraftBukkit-Patches/0152-Fix-Some-Memory-Leaks.patch @@ -1,4 +1,4 @@ -From a16d1971da626d2bc10b63fd2afd36fdec1a3955 Mon Sep 17 00:00:00 2001 +From 76c26e3bbd7473609ba7e39a6ce2bb32c0e6294a 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/0153-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0153-Refactor-ItemDoor-Place.patch index 8016857e70..fccd1f958c 100644 --- a/CraftBukkit-Patches/0153-Refactor-ItemDoor-Place.patch +++ b/CraftBukkit-Patches/0153-Refactor-ItemDoor-Place.patch @@ -1,4 +1,4 @@ -From d98a2ce5d86680dc5d80a94cf5f8e5c413887226 Mon Sep 17 00:00:00 2001 +From 5d7bdc3eced23a34170fbc7b7f66ca9c596a2a93 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/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch b/CraftBukkit-Patches/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch index 6caf1694f2..442fa588de 100644 --- a/CraftBukkit-Patches/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch +++ b/CraftBukkit-Patches/0154-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch @@ -1,4 +1,4 @@ -From c454f0e6d327d22dce343b9b2379028efd072dcd Mon Sep 17 00:00:00 2001 +From b380d4bfcb871cf8c761e4446e5f72fdfb7af0fa 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/CraftBukkit-Patches/0155-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0155-BungeeCord-Chat-API.patch index 86bea5c2fa..d895d72a7c 100644 --- a/CraftBukkit-Patches/0155-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0155-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From 660a4cb41b1c6293406af007eab70d428074ac9d Mon Sep 17 00:00:00 2001 +From be9723d72b54939a82aef0e0d7e3bf466c7b59db 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/CraftBukkit-Patches/0156-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0156-Use-Standard-List-for-EntitySlices.patch index 9591f85a53..46a3961ebe 100644 --- a/CraftBukkit-Patches/0156-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0156-Use-Standard-List-for-EntitySlices.patch @@ -1,4 +1,4 @@ -From 5230ac21e4f2933df2473d8843c33d1d571a6f4d Mon Sep 17 00:00:00 2001 +From 8a2d1364f6443c563cf18dc6c29c020f8fd9e286 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:33:36 +1100 Subject: [PATCH] Use Standard List for EntitySlices. diff --git a/CraftBukkit-Patches/0157-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0157-Allow-Capping-Tile-Entity-Tick-Time.patch index 548c6e4658..9556cdd8f6 100644 --- a/CraftBukkit-Patches/0157-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0157-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 9fb6c64d4e29849949078a5a561aad2978db8f57 Mon Sep 17 00:00:00 2001 +From 9d4faf8e6621c81e44b80943505042469bb59683 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:39:31 +1100 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time. @@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based This feature was commisioned by Chunkr. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1e03e19..d938b85 100644 +index 1f41281..34d3697 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -134,6 +134,9 @@ public abstract class World implements IBlockAccess { @@ -23,7 +23,7 @@ index 1e03e19..d938b85 100644 public static long chunkToKey(int x, int z) { -@@ -222,6 +225,8 @@ public abstract class World implements IBlockAccess { +@@ -225,6 +228,8 @@ public abstract class World implements IBlockAccess { this.getServer().addWorld(this.world); // CraftBukkit end timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings @@ -32,7 +32,7 @@ index 1e03e19..d938b85 100644 } public World b() { -@@ -1393,7 +1398,12 @@ public abstract class World implements IBlockAccess { +@@ -1396,7 +1401,12 @@ public abstract class World implements IBlockAccess { timings.entityTick.startTiming(); // Spigot guardEntityList = true; // Spigot // CraftBukkit start - Use field for loop variable @@ -46,7 +46,7 @@ index 1e03e19..d938b85 100644 entity = (Entity) this.entityList.get(this.tickPosition); // CraftBukkit end if (entity.vehicle != null) { -@@ -1449,14 +1459,18 @@ public abstract class World implements IBlockAccess { +@@ -1452,14 +1462,18 @@ public abstract class World implements IBlockAccess { this.c.clear(); } // CraftBukkit end @@ -69,7 +69,7 @@ index 1e03e19..d938b85 100644 continue; } // Spigot end -@@ -1484,7 +1498,7 @@ public abstract class World implements IBlockAccess { +@@ -1487,7 +1501,7 @@ public abstract class World implements IBlockAccess { } if (tileentity.x()) { diff --git a/CraftBukkit-Patches/0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch index fde4e33c16..b0ae287032 100644 --- a/CraftBukkit-Patches/0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch +++ b/CraftBukkit-Patches/0158-Use-FastMatches-for-ItemStack-Dirty-Check.patch @@ -1,4 +1,4 @@ -From a9487bc6a175dc9c84ee4b4c3c49628b61e9d0f3 Mon Sep 17 00:00:00 2001 +From 8c7895c3cc2cd187f7e2a9739654c79a4f6ed28e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Feb 2015 12:27:40 +1100 Subject: [PATCH] Use FastMatches for ItemStack Dirty Check