From 2c46441a7bdc6439738460b527c9dda3cc4006a3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 25 May 2015 22:05:40 +1000 Subject: [PATCH] Update to Minecraft 1.8.6 --- Bukkit-Patches/0001-POM-Changes.patch | 6 +++--- Bukkit-Patches/0002-Spigot-Timings.patch | 2 +- .../0003-Add-PlayerItemDamageEvent.patch | 4 ++-- Bukkit-Patches/0004-BungeeCord-Support.patch | 4 ++-- Bukkit-Patches/0005-Add-Arrow-API.patch | 4 ++-- Bukkit-Patches/0006-Add-Particle-API.patch | 4 ++-- ...ne-EntitySpawnEvent-and-SpawnerSpawnEvent.patch | 4 ++-- .../0008-Entity-Mount-and-Dismount-Events.patch | 4 ++-- ...9-InventoryClickEvent-getClickedInventory.patch | 4 ++-- ...getAllSessionData-to-the-Conversation-API.patch | 4 ++-- .../0011-Catch-Conversation-API-Errors.patch | 4 ++-- Bukkit-Patches/0012-Player-Collision-API.patch | 4 ++-- .../0013-Expand-Boolean-Prompt-Values.patch | 4 ++-- ...014-Add-Getter-for-Entity-Invulnerability.patch | 4 ++-- Bukkit-Patches/0015-Add-respawn-API.patch | 4 ++-- .../0016-Fix-Plugin-Message-API-Disconnects.patch | 4 ++-- ...0017-Fix-Tab-Completion-for-Some-Commands.patch | 4 ++-- .../0018-Implement-Locale-Getter-for-Players.patch | 4 ++-- ...9-Add-support-for-fetching-hidden-players.patch | 4 ++-- .../0020-Silenceable-Lightning-API.patch | 4 ++-- ...deprecation-on-some-player-lookup-methods.patch | 4 ++-- ...xpand-team-API-to-allow-arbitrary-strings.patch | 4 ++-- .../0023-Add-Score.isScoreSet-Z-API.patch | 4 ++-- .../0024-Add-PlayerSpawnLocationEvent.patch | 4 ++-- ...Ease-ClassLoader-Deadlocks-Where-Possible.patch | 6 +++--- ...6-Fix-slow-tab-complete-for-some-commands.patch | 4 ++-- ...0027-Undeprecate-Player-updateInventory-V.patch | 4 ++-- ...nbreakable-and-setUnbreakable-to-ItemMeta.patch | 4 ++-- Bukkit-Patches/0029-BungeeCord-Chat-API.patch | 6 +++--- CraftBukkit-Patches/0001-POM-Changes.patch | 6 +++--- CraftBukkit-Patches/0002-mc-dev-imports.patch | 2 +- .../0003-Skeleton-API-Implementations.patch | 6 +++--- CraftBukkit-Patches/0004-Obfuscation-Helpers.patch | 4 ++-- .../0005-Spigot-Configuration.patch | 8 ++++---- .../0006-Better-Chunk-Tick-Selection.patch | 8 ++++---- CraftBukkit-Patches/0007-Crop-Growth-Rates.patch | 4 ++-- .../0008-Merge-tweaks-and-configuration.patch | 2 +- .../0009-Async-Operation-Catching.patch | 2 +- CraftBukkit-Patches/0010-View-Distance.patch | 2 +- CraftBukkit-Patches/0011-Spigot-Timings.patch | 14 +++++++------- ...ix-Mob-Spawning-Relative-to-View-Distance.patch | 2 +- .../0013-Handle-Null-Tile-Entities.patch | 2 +- .../0014-Entity-Activation-Range.patch | 2 +- CraftBukkit-Patches/0015-Metrics.patch | 2 +- .../0016-PlayerItemDamageEvent.patch | 2 +- .../0017-Prevent-NPE-in-CraftSign.patch | 2 +- .../0018-Entity-Tracking-Ranges.patch | 2 +- .../0019-Thread-Naming-and-Tweaks.patch | 2 +- .../0020-Close-Unloaded-Save-Files.patch | 2 +- CraftBukkit-Patches/0021-Remove-o-Option.patch | 2 +- .../0022-Recipe-Deconstruction.patch | 2 +- CraftBukkit-Patches/0023-Implement-Arrow-API.patch | 2 +- .../0024-Hopper-Customisations.patch | 4 ++-- .../0025-Implement-SpawnerSpawnEvent.patch | 2 +- .../0026-Firework-Meta-Crash-Fix.patch | 2 +- .../0027-Allow-Disabling-of-Command-Logging.patch | 4 ++-- ...28-Allow-Disabling-of-Command-TabComplete.patch | 2 +- .../0029-Configurable-Messages.patch | 12 ++++++------ ...llow-Disabling-of-Random-Lighting-Updates.patch | 2 +- .../0031-Properly-Close-Inventories.patch | 2 +- .../0032-Disallow-Interaction-With-Self.patch | 4 ++-- .../0033-Entity-Mount-and-Dismount-Events.patch | 2 +- ...4-Prevent-Ghost-Players-Caused-by-Plugins.patch | 4 ++-- .../0035-Plug-World-Unload-Memory-Leak.patch | 2 +- .../0036-Player-Collision-API.patch | 4 ++-- ...7-Fully-Disable-Snooper-When-Not-Required.patch | 4 ++-- ...038-Add-Getter-for-Entity-Invulnerability.patch | 2 +- .../0039-Cap-Minimum-Player-Speed.patch | 2 +- ...ntory-and-Health-for-PlayerConsumeItemEve.patch | 2 +- ...ChangeBlockEvent-for-Fire-Arrows-hitting-.patch | 2 +- ...Allow-Disabling-of-1.6.3-Structure-Saving.patch | 2 +- CraftBukkit-Patches/0043-Item-Despawn-Rate.patch | 2 +- .../0044-Don-t-Special-Case-X-Move-Value.patch | 4 ++-- .../0045-Implement-respawn-API.patch | 2 +- CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch | 2 +- .../0047-Fix-packed-ice-generation.patch | 2 +- CraftBukkit-Patches/0048-Watchdog-Thread.patch | 8 ++++---- .../0049-Clear-Flower-Pot-on-Drop.patch | 2 +- ...-some-chunks-not-being-sent-to-the-client.patch | 2 +- .../0051-Fix-Broken-Async-Chat.patch | 2 +- CraftBukkit-Patches/0052-Orebfuscator.patch | 4 ++-- .../0053-Optimize-DataWatcher.patch | 2 +- ...0054-Fire-PreLogin-Events-in-Offline-Mode.patch | 2 +- CraftBukkit-Patches/0055-BungeeCord-Support.patch | 8 ++++---- ...llow-Disabling-Zombie-Villager-Aggression.patch | 2 +- ...0057-Configurable-Amount-of-Netty-Threads.patch | 4 ++-- .../0058-Prevent-Mineshaft-Saving.patch | 2 +- .../0059-Log-Cause-of-Unexpected-Exceptions.patch | 4 ++-- CraftBukkit-Patches/0060-Particle-API.patch | 2 +- .../0061-Save-ticks-lived-to-nbttag.patch | 2 +- .../0062-More-Efficient-GetCubes.patch | 2 +- ...63-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch | 2 +- .../0064-Warn-if-PermGen-may-be-insufficient.patch | 2 +- ...-Disable-Connected-Check-on-setScoreboard.patch | 2 +- .../0066-Add-Late-Bind-Option.patch | 10 +++++----- ...67-Allow-statistics-to-be-disabled-forced.patch | 4 ++-- .../0068-Fix-ItemStack-Unbreakable-Code.patch | 2 +- ...0069-Try-and-Debug-Crash-Reports-Crashing.patch | 4 ++-- .../0070-Improve-AutoSave-Mechanism.patch | 4 ++-- ...stalling-on-corrupted-map-data-NBT-arrays.patch | 2 +- ...ing-of-ZombiePigmen-spawning-in-portal-bl.patch | 2 +- .../0073-Highly-Optimized-Tick-Loop.patch | 6 +++--- CraftBukkit-Patches/0074-Add-Spigot-Links.patch | 2 +- .../0075-Configurable-Ping-Sample-Size.patch | 4 ++-- .../0076-Add-Optional-Tick-Shuffling.patch | 4 ++-- .../0077-Allow-Configuring-Chunks-per-Packet.patch | 4 ++-- .../0078-Implement-Locale-Getter-for-Players.patch | 4 ++-- .../0079-Cap-Entity-Collisions.patch | 2 +- ...ing-bone-meal-not-having-the-correct-data.patch | 4 ++-- .../0081-Spam-Filter-Exclusions.patch | 4 ++-- ...dd-Option-to-Silence-CommandBlock-Console.patch | 2 +- ...3-Add-support-for-fetching-hidden-players.patch | 2 +- ...0084-Allow-Disabling-Creative-Item-Filter.patch | 6 +++--- .../0085-Cap-Channel-Registrations.patch | 2 +- ...la-commands-to-be-the-main-version-of-a-c.patch | 2 +- ...alize-the-isDisconnected-method-by-bukkit.patch | 6 +++--- .../0088-Implement-Silenceable-Lightning-API.patch | 2 +- ...ne-PermissibleBase-for-all-Command-Blocks.patch | 2 +- .../0090-Prevent-hoppers-from-loading-chunks.patch | 4 ++-- CraftBukkit-Patches/0091-Guard-Entity-List.patch | 2 +- ...entModificationException-while-being-idle.patch | 2 +- ...093-Cancellable-WitherSkull-potion-effect.patch | 2 +- ...-Descriptive-kick-reasons-instead-of-Nope.patch | 4 ++-- ...able-dragon-death-and-wither-spawn-sounds.patch | 2 +- ...got-in-client-crashes-server-lists-and-Mo.patch | 4 ++-- .../0097-Treat-Bungee-as-Online-Mode.patch | 2 +- .../0098-Add-Conversion-Message.patch | 6 +++--- ...y-cancel-fishing-event.-Fixes-BUKKIT-5396.patch | 2 +- .../0100-Print-Stack-on-InternalException.patch | 2 +- ...-Use-Offline-Player-Data-Once-if-Required.patch | 2 +- ...ded-Case-for-Non-Existent-Offline-Players.patch | 4 ++-- .../0103-Check-for-blank-OfflinePlayer-Names.patch | 2 +- CraftBukkit-Patches/0104-Fix-Player-Banning.patch | 2 +- .../0105-Fix-ban-expire-dates.patch | 2 +- .../0106-Correct-Ban-Expiration.patch | 4 ++-- .../0107-Convert-Horses-owner-to-UUID.patch | 2 +- ...xpand-team-API-to-allow-arbitrary-strings.patch | 2 +- .../0109-Add-Score.isScoreSet-Z-API.patch | 2 +- .../0110-Log-null-TileEntity-Owner.patch | 6 +++--- ...-special-case-invalid-usernames-for-UUIDs.patch | 2 +- .../0112-Convert-player-skulls-async.patch | 2 +- ...NoClassDefError-crash-and-notify-on-crash.patch | 2 +- .../0114-Check-Skull-canPlace.patch | 2 +- ...ndition-that-could-kill-connections-befor.patch | 4 ++-- .../0116-Configurable-UserCache-cap.patch | 4 ++-- .../0117-Implement-PlayerSpawnLocationEvent.patch | 4 ++-- .../0118-Cap-Objective-Score-Length.patch | 2 +- ...versation-input-on-the-main-thread.-Fixes.patch | 4 ++-- ...figurable-save-on-stop-only-for-UserCache.patch | 6 +++--- .../0121-Prevent-Unbounded-IntCache-Growth.patch | 2 +- .../0122-Add-damager-to-the-unhandled-error.patch | 2 +- .../0123-Cross-World-Entity-Teleportation.patch | 2 +- ...Limit-block-placement-interaction-packets.patch | 6 +++--- .../0125-Better-item-validation.patch | 2 +- .../0126-Further-Seed-Customisation.patch | 2 +- .../0127-Disable-ResourceLeakDetector.patch | 4 ++-- ...d-More-Information-to-session.lock-Errors.patch | 2 +- CraftBukkit-Patches/0129-Safer-JSON-Loading.patch | 4 ++-- .../0130-Fix-Slow-Loading-Libraries.patch | 2 +- .../0131-Add-CommandLine-EULA-Flag.patch | 6 +++--- ...hanting-table-wiping-meta-when-placing-st.patch | 2 +- ...-bonus-ocelots-when-plugins-spawn-ocelots.patch | 2 +- ...0134-Prevent-a-crash-involving-attributes.patch | 2 +- ...135-Make-moved-wrongly-limit-configurable.patch | 4 ++-- .../0136-Fix-Null-Tile-Entity-Worlds.patch | 2 +- ...Make-moved-too-quickly-limit-configurable.patch | 4 ++-- .../0138-Apply-NBTReadLimiter-to-more-things.patch | 2 +- .../0139-Allow-Attribute-Capping.patch | 2 +- ...-Only-fetch-an-online-UUID-in-online-mode.patch | 2 +- ...ibute-modifiers-which-cause-the-attribute.patch | 2 +- .../0142-Plug-WorldMap-Memory-Leak.patch | 2 +- .../0143-Fix-Corrupted-Trapped-Chest.patch | 2 +- .../0144-Remove-uneeded-validation.patch | 4 ++-- .../0145-Add-Hunger-Config-Values.patch | 2 +- .../0146-Make-debug-logging-togglable.patch | 2 +- ...47-Skip-invalid-enchants-in-CraftMetaItem.patch | 4 ++-- .../0148-Limit-TNT-Detonations-per-tick.patch | 2 +- ...nbreakable-and-setUnbreakable-to-ItemMeta.patch | 4 ++-- .../0150-Configurable-Hanging-Tick.patch | 2 +- .../0151-Refactor-ItemDoor-Place.patch | 2 +- CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch | 2 +- .../0153-Use-Standard-List-for-EntitySlices.patch | 2 +- .../0154-Allow-Capping-Tile-Entity-Tick-Time.patch | 2 +- ...Use-FastMatches-for-ItemStack-Dirty-Check.patch | 2 +- .../0156-Use-CLQ-for-main-thread-tasks.patch | 4 ++-- 185 files changed, 301 insertions(+), 301 deletions(-) diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 73f8795d69..3d85533d5f 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From f1cb30a12af3222fecbc28cad6d8df59ff4963b6 Mon Sep 17 00:00:00 2001 +From 8a45243cbfa1e3db958002fe4f0c24d4c2f3f159 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 a26d96b..7775718 100644 +index ed68803..2cc6c69 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ @@ -16,7 +16,7 @@ index a26d96b..7775718 100644 - bukkit + org.spigotmc + spigot-api - 1.8.5-R0.1-SNAPSHOT + 1.8.6-R0.1-SNAPSHOT jar - Bukkit diff --git a/Bukkit-Patches/0002-Spigot-Timings.patch b/Bukkit-Patches/0002-Spigot-Timings.patch index f6165c6723..2a3ae76631 100644 --- a/Bukkit-Patches/0002-Spigot-Timings.patch +++ b/Bukkit-Patches/0002-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 1a62f1feadb23a51bba04813d45ba8fedfed242a Mon Sep 17 00:00:00 2001 +From 7087e5182440a2bd37ae53dccdfeca2ab0ed11f8 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 826a8989e2..cc0647efe2 100644 --- a/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch +++ b/Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 2d18e44b5ee7f59b3f7844a138d64bbab7d580fd Mon Sep 17 00:00:00 2001 +From d1fb850ed9fe49904a166451978cf4701fc66069 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:31:20 +1100 Subject: [PATCH] Add PlayerItemDamageEvent @@ -65,5 +65,5 @@ index 0000000..38a72ab + } +} -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0004-BungeeCord-Support.patch b/Bukkit-Patches/0004-BungeeCord-Support.patch index 3e9cffd5e0..7342b1b618 100644 --- a/Bukkit-Patches/0004-BungeeCord-Support.patch +++ b/Bukkit-Patches/0004-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From eb486ea6ea78b6824f4cecddc34f9423987edeb9 Mon Sep 17 00:00:00 2001 +From 635849b293923601730cdf18a99a9437b6fa2a96 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support @@ -99,5 +99,5 @@ index 68834dd..4bc024f 100644 * Gets the current result of the login, as an enum * -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0005-Add-Arrow-API.patch b/Bukkit-Patches/0005-Add-Arrow-API.patch index 0b299b6967..18c111fd10 100644 --- a/Bukkit-Patches/0005-Add-Arrow-API.patch +++ b/Bukkit-Patches/0005-Add-Arrow-API.patch @@ -1,4 +1,4 @@ -From 739d7342a19667e1f12587cb156d1b1f1fa3cacf Mon Sep 17 00:00:00 2001 +From 6df1a1942db9ba0c51f5d0d44755e7fc6c178b1f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:08:24 +1000 Subject: [PATCH] Add Arrow API @@ -30,5 +30,5 @@ index e49eef0..e7a32f7 100644 + Spigot spigot(); } -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0006-Add-Particle-API.patch b/Bukkit-Patches/0006-Add-Particle-API.patch index a883a1cba0..114604be70 100644 --- a/Bukkit-Patches/0006-Add-Particle-API.patch +++ b/Bukkit-Patches/0006-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From db57ed2aee8b42ecec7af16e017c96fdcd387672 Mon Sep 17 00:00:00 2001 +From 01f99fc968bc61b744aadedbbce25d2ed91fcf6c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API @@ -365,5 +365,5 @@ index 08aa71d..5217aec 100644 } } -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch index 9eadad15e3..688de6663a 100644 --- a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch +++ b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 7862f270a5ff8a6a7a57dbaf474145be2d237b15 Mon Sep 17 00:00:00 2001 +From 881e18a4165bda3606d6f8a56b70fdda366d1570 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 @@ -216,5 +216,5 @@ index 0000000..1acb3c4 + } +} -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch index 3434a94412..db7ec6fe88 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 c5ed18ba089e160a53c54b4ace4403e10535d6bb Mon Sep 17 00:00:00 2001 +From 25b939248a75194bf269587f6b32967ff9dd50a0 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 @@ -108,5 +108,5 @@ index 0000000..16aa2a7 + } +} -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch index db9807c615..36de9c6ada 100644 --- a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch +++ b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch @@ -1,4 +1,4 @@ -From 5ae9c2efd241a76cc711525ca4326d426801eadc Mon Sep 17 00:00:00 2001 +From 448b8cd86c63dc50bf5479506b85814595387256 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 7 Jul 2013 10:32:05 -0400 Subject: [PATCH] InventoryClickEvent getClickedInventory @@ -50,5 +50,5 @@ index 28198b8..3313d91 100644 * * @return the slot type -- -2.1.0 +2.1.4 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 7d247742a9..db278ff9e7 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 47931fc43414c74c78ed3409360d26669b1ff2a8 Mon Sep 17 00:00:00 2001 +From c502417b8d25ebeb61357371aeec2e64d71aec25 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. @@ -24,5 +24,5 @@ index 4f33ff4..7390a77 100644 * this as a way to pass data through each Prompt as the conversation * develops. -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch index 1a4d0899a3..ba8a5d0d6b 100644 --- a/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch +++ b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch @@ -1,4 +1,4 @@ -From 3e6af070752f6e1756f4e4e444fb1ac3e92e9783 Mon Sep 17 00:00:00 2001 +From dae3333416b4cb55f40217339e635d32f9516864 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 @@ -30,5 +30,5 @@ index d4c1f6d..46912c8 100644 /** -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0012-Player-Collision-API.patch b/Bukkit-Patches/0012-Player-Collision-API.patch index 9c9f8faacd..b442904bac 100644 --- a/Bukkit-Patches/0012-Player-Collision-API.patch +++ b/Bukkit-Patches/0012-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 84f12c10d66a4f878032a1fdf7316e3044c4dfa6 Mon Sep 17 00:00:00 2001 +From a8a5d39f2fd96465b66ec5f9f17a8a6ae3bda9f5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:20:50 +1000 Subject: [PATCH] Player Collision API @@ -37,5 +37,5 @@ index 0810c68..597bca1 100644 Spigot spigot(); -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch index b12a136a96..97d4640e84 100644 --- a/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch +++ b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch @@ -1,4 +1,4 @@ -From dd8287e344e0def1c8cfb6f97d25dade30efed02 Mon Sep 17 00:00:00 2001 +From 8b2b862220b72654e09a83db71a8480dea4b374f 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 @@ -24,5 +24,5 @@ index 3f2c97f..81ef78c 100644 } -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch index b275984ebc..93eadc9811 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 1de51bb79c14ddc6f82312bfce4f715bdea119e2 Mon Sep 17 00:00:00 2001 +From 33bcec116a7d0b271a247aa325c288cebceab936 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 @@ -32,5 +32,5 @@ index de7815f..7fb08af 100644 + // Spigot End } -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0015-Add-respawn-API.patch b/Bukkit-Patches/0015-Add-respawn-API.patch index 2f23dd9c47..3cdd89737a 100644 --- a/Bukkit-Patches/0015-Add-respawn-API.patch +++ b/Bukkit-Patches/0015-Add-respawn-API.patch @@ -1,4 +1,4 @@ -From 3632b30fbdb53e687105534c778660271aba4139 Mon Sep 17 00:00:00 2001 +From f07f6b66ac42640bcd481710667e02ba494f29be Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:35:58 +0200 Subject: [PATCH] Add respawn API. @@ -24,5 +24,5 @@ index 597bca1..da4da7c 100644 Spigot spigot(); -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch b/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch index 1fa9af85a7..52c8e65d6e 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 c10d11b324d23598760948181d1071c27ba5fe8d Mon Sep 17 00:00:00 2001 +From cbf5dc1f5e2241264419592fdc12a73997f270bb 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 @@ -26,5 +26,5 @@ index a906f8d..4c171e8 100644 } -- -2.1.0 +2.1.4 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 42ffa89a55..cd6ad22718 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 800263a2dffc256a03dea9f5fbf55c0b6655a4b8 Mon Sep 17 00:00:00 2001 +From 183a4b3be424e009fc996e7baf6d88de15805652 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 @@ -81,5 +81,5 @@ index 7e5494d..e168b49 100644 + // Spigot End } -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch index aae0dd1e03..049bac5878 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 ac6fd9bc362fbc79e4746a883029f4820d40d5ff Mon Sep 17 00:00:00 2001 +From 5958f1a4d759ddbb6df71a76dce144d979ee94d7 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 @@ -26,5 +26,5 @@ index da4da7c..57e6eae 100644 Spigot spigot(); -- -2.1.0 +2.1.4 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 03eda5f1a6..3227acc267 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 3b771013b8c082fa2616646d58080b71f38857c5 Mon Sep 17 00:00:00 2001 +From b3f637a30ead745921e73bc6bf54be21bc25b23a 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 @@ -26,5 +26,5 @@ index 57e6eae..7ed0f6a 100644 Spigot spigot(); -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch index 4b4ed9fa7f..5edb992c79 100644 --- a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 9b9a1b210f0d8ef1bb5709c13b5081966b1b5438 Mon Sep 17 00:00:00 2001 +From 2da3867ab296fef727f7a85a2af2f8c08ad5552c Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:29 -0400 Subject: [PATCH] Silenceable Lightning API @@ -66,5 +66,5 @@ index c8b5154..1ed4ac9 100644 + Spigot spigot(); } -- -2.1.0 +2.1.4 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 f41e9e8201..a233f6f0ef 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 2d012a8bccfa96afa182bf96a0daaff4889f0d12 Mon Sep 17 00:00:00 2001 +From 59c2dab8155fa5d479c75d45ffbcc719fd5d4871 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 @@ -90,5 +90,5 @@ index a57d506..57b2794 100644 /** -- -2.1.0 +2.1.4 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 af39ea0c27..0b85123bb5 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 c9dfbfd4fcf780e9d9ee84781b9eb86134c3a27a Mon Sep 17 00:00:00 2001 +From 9c4aae143d9dc26ef36e30c819fa4ad97f9801cb 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. @@ -71,5 +71,5 @@ index e6d1442..2bd78e3 100644 + // Spigot end } -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch b/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch index 05b85a3885..42d373b2c1 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 7aee846094b100f670a353efbc8918255aae8a5a Mon Sep 17 00:00:00 2001 +From cf631eb590b0bd2757c43114604659679251b8d9 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. @@ -27,5 +27,5 @@ index 4c10346..2410cbd 100644 * Gets the scoreboard for the associated objective. * -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch b/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch index d98a54f41b..ba31d1e2b4 100644 --- a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch +++ b/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From 71ef19ac9942dca56ccad73421ef801368d58cc6 Mon Sep 17 00:00:00 2001 +From da0f36b3061dede561dfab0e831e555fc8a71886 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:01:32 +0200 Subject: [PATCH] Add PlayerSpawnLocationEvent. @@ -61,5 +61,5 @@ index 0000000..dd3f58c + } +} -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch b/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch index 607d7c20db..aadc638d28 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 314a5046edb39a82c652c586a115517209edccdd Mon Sep 17 00:00:00 2001 +From a62698171547806cae2eb4b3cac7408c01b6c074 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible When on Java 7 we can register the classloader as parallel capable to prevent deadlocks caused by certain scenarios. Due to the nature of PluginClassLoader this isn't completely safe, but we can make it safer by switching to concurrency focused collections. Either way this is far better than crashing the server. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index b081ecb..0ac8325 100644 +index cd843f4..7bf2fa6 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -48,7 +48,7 @@ import org.yaml.snakeyaml.error.YAMLException; @@ -63,5 +63,5 @@ index 13f8633..4cffa13 100644 super(new URL[] {file.toURI().toURL()}, parent); Validate.notNull(loader, "Loader cannot be null"); -- -2.1.0 +2.1.4 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 5a6a705e93..fe46d72f04 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 1d140f622f04696aac22e605d2ed49e0688dbcdc Mon Sep 17 00:00:00 2001 +From 03ba1b9d5a03c6c9632efb0f845ee707fe8d652a 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. @@ -19,5 +19,5 @@ index 92de43c..855f560 100644 if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) { completions.add(name); -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch b/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch index a5a55e8b46..f19debb545 100644 --- a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch +++ b/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch @@ -1,4 +1,4 @@ -From 82904bf5b902199c2615a81ddb4a89ca358f406f Mon Sep 17 00:00:00 2001 +From 12038bfe5f1bbfb36a0e0b74528c3680a02b2794 Mon Sep 17 00:00:00 2001 From: drXor Date: Wed, 23 Jul 2014 15:50:36 -0400 Subject: [PATCH] Undeprecate Player#updateInventory()V @@ -21,5 +21,5 @@ index 7ed0f6a..b55d70e 100644 /** -- -2.1.0 +2.1.4 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 47b2106f4c..5e305ac752 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 cf511ed7cea31987804c0af79bb78f7ee8b2893a Mon Sep 17 00:00:00 2001 +From bba59a058b2f6d6bd80355d6cd9a5f376fe7825d 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 @@ -42,5 +42,5 @@ index 459e09c..d8cc821 100644 + // Spigot end } -- -2.1.0 +2.1.4 diff --git a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch b/Bukkit-Patches/0029-BungeeCord-Chat-API.patch index 457b843460..a8ead2faa5 100644 --- a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch +++ b/Bukkit-Patches/0029-BungeeCord-Chat-API.patch @@ -1,11 +1,11 @@ -From 6dff977727209092ca5a546d7a5ed3c8845bebe2 Mon Sep 17 00:00:00 2001 +From 674737df7ba00a59b6fd832619dd04d3ca673cd7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 12:59:14 +1100 Subject: [PATCH] BungeeCord Chat API diff --git a/pom.xml b/pom.xml -index 78f50bd..3e52a20 100644 +index 2cc6c69..a8cde4f 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,14 @@ @@ -82,5 +82,5 @@ index b55d70e..8eb781e 100644 Spigot spigot(); -- -2.1.0 +2.1.4 diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index 7fd7d58ef0..c84f053708 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 846140a136ee89b1bb54cff2c02d5dc2d5124c4a Mon Sep 17 00:00:00 2001 +From 97e0492b1f6b41154e95116b9a01bc14159320aa Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes @@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us. diff --git a/pom.xml b/pom.xml -index 4cecb88..f15cc07 100644 +index 5ad55dc..99fe937 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -18,7 +18,7 @@ index 4cecb88..f15cc07 100644 + org.spigotmc + spigot jar - 1.8.5-R0.1-SNAPSHOT + 1.8.6-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index a8b899ab6c..4c17cf0d8d 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From cf7c6c8710b54f1a7451163c6aab72baf7865e42 Mon Sep 17 00:00:00 2001 +From 68660010d2f0ede16bb79d23a7d2b45780152cbf 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 5380b9f062..7e230026c8 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From f8adc00eb44d01b70012f7247e4e5e76813ced4d Mon Sep 17 00:00:00 2001 +From 24bfb6d05f0a60acec83e0327d4c042d6f17ed12 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -104,7 +104,7 @@ index 64e346d..243e8e5 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 16a35b8..c1879f4 100644 +index e229dc0..9396b93 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1313,4 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -192,5 +192,5 @@ index ce42b30..342d4af 100644 } -- -2.1.0 +2.1.4 diff --git a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch index 84aea3cfb3..2e1ed0bee1 100644 --- a/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch +++ b/CraftBukkit-Patches/0004-Obfuscation-Helpers.patch @@ -1,4 +1,4 @@ -From 81ac39d4872b1c7aafdb5d97d52d300cd9fe8cf1 Mon Sep 17 00:00:00 2001 +From 66a4f410c044c124e0f1cd31a53d6808f05d1dff Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Apr 2014 10:38:04 +1000 Subject: [PATCH] Obfuscation Helpers @@ -6,7 +6,7 @@ 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 f82dffc..4393458 100644 +index 7b2bedb..4941eed 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1290,6 +1290,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 b9ed82c98b..f96b6480c0 100644 --- a/CraftBukkit-Patches/0005-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0005-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 8da8982b64580b634950760eecc6e828066f436e Mon Sep 17 00:00:00 2001 +From 7aa8f30d33ee7c3805cd69598a52f256e19159a0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -6,10 +6,10 @@ Subject: [PATCH] Spigot Configuration Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index c922b4c..fc5e8cf 100644 +index 1094be8..7e440b0 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -163,6 +163,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -162,6 +162,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer if (this.R() < 0) { this.setPort(this.propertyManager.getInt("server-port", 25565)); } @@ -21,7 +21,7 @@ index c922b4c..fc5e8cf 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); -@@ -177,7 +182,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -176,7 +181,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer return false; } diff --git a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch index 93d129dd40..b8af074fad 100644 --- a/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch +++ b/CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch @@ -1,4 +1,4 @@ -From b77b6805e5dbf69e76e5dc928f9ed9129228e14c Mon Sep 17 00:00:00 2001 +From 433014e997da1ba1f03bfa2cfda97558e18ace8d 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 52e3cfa..75e0714 100644 +index 0356d9e..c81f673 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess { @@ -112,7 +112,7 @@ index 52e3cfa..75e0714 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 40e63fc..5fd3934 100644 +index 5faefba..03cac6e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -357,12 +357,15 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -193,5 +193,5 @@ index 961ddb4..90a227f 100644 + } } -- -2.1.0 +2.1.4 diff --git a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch index d45860933a..0dc86b27a2 100644 --- a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From 70e45bd978fa1d1dd51e1e8597e1443f3215beab Mon Sep 17 00:00:00 2001 +From b9e008279870787a67daf990e60c5c3c71f95223 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:17:20 +1000 Subject: [PATCH] Crop Growth Rates @@ -172,5 +172,5 @@ index 90a227f..7e79ba5 100644 + } } -- -2.1.0 +2.1.4 diff --git a/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch index cfae380d9a..34ee69ccd2 100644 --- a/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 9ef3f73eede644ade5f6039f631806b6c688c4d5 Mon Sep 17 00:00:00 2001 +From bfbf7675709d97ce57abc5a7a78e1acb3716a350 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 diff --git a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch index 3b1f82c5db..42de9c2d2d 100644 --- a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From f1fbe73a279beb21f8f68866cd39e0938b58ab9c Mon Sep 17 00:00:00 2001 +From 9be637512105ef94ff3f673c0cae43bcb199173e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching diff --git a/CraftBukkit-Patches/0010-View-Distance.patch b/CraftBukkit-Patches/0010-View-Distance.patch index dd91f12260..34dbe50a7e 100644 --- a/CraftBukkit-Patches/0010-View-Distance.patch +++ b/CraftBukkit-Patches/0010-View-Distance.patch @@ -1,4 +1,4 @@ -From d9fedfa532dd1f937fcea3a779a1fd0a2b9dce7f Mon Sep 17 00:00:00 2001 +From 3851ac651a87a6d9241935fe20db52f031ba2b7b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance diff --git a/CraftBukkit-Patches/0011-Spigot-Timings.patch b/CraftBukkit-Patches/0011-Spigot-Timings.patch index 8e215c1db4..1fc22375a7 100644 --- a/CraftBukkit-Patches/0011-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0011-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 05dd86d1ddf919552e07ec557d26e55757fe4be6 Mon Sep 17 00:00:00 2001 +From be288c6477a833de5710270c85047bd1bb0b2a86 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644 // return chunk; // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index fc5e8cf..3d5801c 100644 +index 7e440b0..948a2f6 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -20,6 +20,7 @@ import java.io.PrintStream; @@ -117,7 +117,7 @@ index fc5e8cf..3d5801c 100644 import org.bukkit.event.server.ServerCommandEvent; import org.bukkit.craftbukkit.util.Waitable; import org.bukkit.event.server.RemoteServerCommandEvent; -@@ -369,6 +370,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -368,6 +369,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } public void aO() { @@ -125,7 +125,7 @@ index fc5e8cf..3d5801c 100644 while (!this.l.isEmpty()) { ServerCommand servercommand = (ServerCommand) this.l.remove(0); -@@ -382,6 +384,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -381,6 +383,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer // CraftBukkit end } @@ -242,7 +242,7 @@ index 2e81b7e..0638f6f 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 4393458..1cc4e47 100644 +index 4941eed..fe61577 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; @@ -367,7 +367,7 @@ index 4393458..1cc4e47 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2ed67e6..424ac34 100644 +index 8767bc3..794464a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1063,6 +1063,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -402,7 +402,7 @@ index 2ed67e6..424ac34 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index d80bbaf..02c9250 100644 +index 513712d..b8d0961 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -6,10 +6,12 @@ import java.util.concurrent.Callable; diff --git a/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch index db18c00162..41aadf06c2 100644 --- a/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0012-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From 4d2e521609df2f20d5d1756066d443c9a1c9e800 Mon Sep 17 00:00:00 2001 +From 77cfdf67693de72cbff5d5ff9e7529bcc590d31e 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/0013-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch index 99f1a0df75..b4e7792344 100644 --- a/CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0013-Handle-Null-Tile-Entities.patch @@ -1,4 +1,4 @@ -From b307f13c5fa5ce775d86513090bf31effd770a40 Mon Sep 17 00:00:00 2001 +From 5f633cd86ba8f838007c9d002cd871c047c837c1 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/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch index 234661f4af..8f129ff93a 100644 --- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 3986a3a267b59d1b45e2a8dac33e47354f074ef1 Mon Sep 17 00:00:00 2001 +From a23d5b334c2402c6c17bdbf7254964977c5422c9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range diff --git a/CraftBukkit-Patches/0015-Metrics.patch b/CraftBukkit-Patches/0015-Metrics.patch index f22878f32c..6dc29a72fc 100644 --- a/CraftBukkit-Patches/0015-Metrics.patch +++ b/CraftBukkit-Patches/0015-Metrics.patch @@ -1,4 +1,4 @@ -From f7aa249e67cd5daf82a35fbc0478ba59aac38ef7 Mon Sep 17 00:00:00 2001 +From fc05d78cd33c1c9c04434b6dbc76544c62765ea4 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/0016-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch index 4586037c13..a894b28655 100644 --- a/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From ce05d40e7bb517074413745ed2c76007e19f9208 Mon Sep 17 00:00:00 2001 +From b945ad4d711097ee21e36708c69e9ffd1d6f0d97 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/0017-Prevent-NPE-in-CraftSign.patch b/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch index 5b49b4053e..3a8f97e29d 100644 --- a/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch +++ b/CraftBukkit-Patches/0017-Prevent-NPE-in-CraftSign.patch @@ -1,4 +1,4 @@ -From 070fb153a784c543bef263e110b898153ec5a410 Mon Sep 17 00:00:00 2001 +From 6d7b55496c097214f4bdb2acdee1b08c8767d2ad 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/0018-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch index ec551799b5..d962dc9016 100644 --- a/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 1ede51990c49d26cdf03d07b30651253351fbc26 Mon Sep 17 00:00:00 2001 +From 26eae42d7d1dde830ab120f6a28c161c24657534 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/0019-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch index 00f285e0ba..b1f4b538b0 100644 --- a/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0019-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From ac9d4469b570ec354dcd1de18efd608d5adb72b7 Mon Sep 17 00:00:00 2001 +From 1b8f113603033107d6980169fd3f5b01eadbdfbb 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/0020-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch index c71b0a6bd8..e78a1e0243 100644 --- a/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0020-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From 721126a58307ce4e03a21b7b2b3f3337d2913a32 Mon Sep 17 00:00:00 2001 +From b57b4f13248edaddeb6b3be296dca129f51449c3 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/0021-Remove-o-Option.patch b/CraftBukkit-Patches/0021-Remove-o-Option.patch index a21398807d..026fa4abe8 100644 --- a/CraftBukkit-Patches/0021-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0021-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From ec8a71fafe7d11b9fc2a7e40e9b91c055390f2c8 Mon Sep 17 00:00:00 2001 +From 7003a11b6d4ce715147b1ede2c6bb8ad53ca95e3 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/0022-Recipe-Deconstruction.patch b/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch index 1bc87b6aad..fca3e48d65 100644 --- a/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch +++ b/CraftBukkit-Patches/0022-Recipe-Deconstruction.patch @@ -1,4 +1,4 @@ -From 95511de518572ab8d52f51332c06bb67babbf0af Mon Sep 17 00:00:00 2001 +From 525b79b4b5bde8c12b36279773be7e2f67bdc1ad 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/0023-Implement-Arrow-API.patch b/CraftBukkit-Patches/0023-Implement-Arrow-API.patch index 881589269d..2246b64074 100644 --- a/CraftBukkit-Patches/0023-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0023-Implement-Arrow-API.patch @@ -1,4 +1,4 @@ -From 6abcfb10cc45520d7c7a0afda68cc24e5ddda18f Mon Sep 17 00:00:00 2001 +From b81ecffb87848ddccf72e3a45d41c57e62aab7dc 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/0024-Hopper-Customisations.patch b/CraftBukkit-Patches/0024-Hopper-Customisations.patch index b2b731c3a6..139a384eed 100644 --- a/CraftBukkit-Patches/0024-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0024-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From 3ed10d5c7954889a72db5cf893bd75f9f6ecf196 Mon Sep 17 00:00:00 2001 +From a461e14b04a6b45d8c25f21f74de10c2a6e6ec56 Mon Sep 17 00:00:00 2001 From: erocs Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations @@ -6,7 +6,7 @@ Subject: [PATCH] Hopper Customisations Allows editing hopper cooldowns and amount transferred per tick. diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 72d067a..8e0d254 100644 +index 8f771af..6785b71 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -194,12 +194,11 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU diff --git a/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch index 9b63bbac74..2555fc53b3 100644 --- a/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 8f680acc75bec4ef8a27cdb4b71056d02355023f Mon Sep 17 00:00:00 2001 +From 0278976e64dfd93bc2929ef0b820f0459a103c77 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/0026-Firework-Meta-Crash-Fix.patch b/CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch index 4f1f0b92ca..c4434d009f 100644 --- a/CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch +++ b/CraftBukkit-Patches/0026-Firework-Meta-Crash-Fix.patch @@ -1,4 +1,4 @@ -From 6e6fc1caba9b757166acd19bc230cbd2a56acb97 Mon Sep 17 00:00:00 2001 +From aa678434ade339ed00754bc9f8c80ff08d57ea6d 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/0027-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch index 5a1dde8610..a39ca134a1 100644 --- a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch @@ -1,11 +1,11 @@ -From 3dfd4fc0ed6077dabd6e87ab6efe7b3d6c1aae5e Mon Sep 17 00:00:00 2001 +From 4b599e4c91e96813a50e4dd2587d65e618018759 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 424ac34..84391af 100644 +index 794464a..40fa8b7 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1065,6 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch index ead6632f23..59103350b1 100644 --- a/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0028-Allow-Disabling-of-Command-TabComplete.patch @@ -1,4 +1,4 @@ -From c5036b414c5ac505bf0687b9abf70d96de66c32f Mon Sep 17 00:00:00 2001 +From 9a1f77ca41cb524963d196c6365f4e70f56d4589 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/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch index 54534806ba..2b97d5a191 100644 --- a/CraftBukkit-Patches/0029-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch @@ -1,24 +1,24 @@ -From 74183abb45c43c42a5f20e55bcf58e2e57f45304 Mon Sep 17 00:00:00 2001 +From ce955efa982c42cf7a948bff866dd127ade52e0f Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 7c4d3cc..ca92289 100644 +index 796d3d3..d0374d0 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener { // CraftBukkit end if (packethandshakinginsetprotocol.b() > 47) { -- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.5"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.5" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.6"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.6" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else if (packethandshakinginsetprotocol.b() < 47) { -- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.5"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.5" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.6"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.6" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else { diff --git a/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch index 3d643d8c78..2d7c144e8c 100644 --- a/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0030-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,4 +1,4 @@ -From a5f3fdc2728151d8feb670f039ee8f12d3965094 Mon Sep 17 00:00:00 2001 +From 8a91b585628c6dafa3dbd14f5cfbc110ea9cf717 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 diff --git a/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch index d3b5fab451..f1fa2fe3c8 100644 --- a/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0031-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From a79c65358468bef6a3b73c0704727e9bfbcb7a66 Mon Sep 17 00:00:00 2001 +From 12be96359526588a261e120b2194e8e9a857e716 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/0032-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch index 055d5b4362..2f9a0d8ee3 100644 --- a/CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0032-Disallow-Interaction-With-Self.patch @@ -1,11 +1,11 @@ -From 5b6b5953ac1e6b01b07f1759de74402c18ce9985 Mon Sep 17 00:00:00 2001 +From e0dd268fff6e3e43b0b43df156d5060c0f90d041 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 84391af..4fa290c 100644 +index 40fa8b7..8cf0b71 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1200,6 +1200,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch index a3e3aee53d..81931e2247 100644 --- a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From 0a8a5051bd17ec33126f3ff7c71fdca402b46d27 Mon Sep 17 00:00:00 2001 +From 7960af011f00e2278bdebb8a09d11b019f55ae35 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/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch index d80b53eb3c..b835b42884 100644 --- a/CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0034-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From a08a33d56eda8fe5b45e66314979bed9669cec66 Mon Sep 17 00:00:00 2001 +From 8394755568aba38313dc9ded45c0e1f4b43d2d1b 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 0278cfd..7b2d8d1 100644 +index 825823d..665d58e 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/0035-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch index 27b7c25c5c..8d02c4cfca 100644 --- a/CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch +++ b/CraftBukkit-Patches/0035-Plug-World-Unload-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 0036e4c68ff2be406d4cd8baaca791c1ceb11be2 Mon Sep 17 00:00:00 2001 +From 30a420e5ff262b3c9772272fa74a0ad8711d9000 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/0036-Player-Collision-API.patch b/CraftBukkit-Patches/0036-Player-Collision-API.patch index 44625dc737..b11cc998c7 100644 --- a/CraftBukkit-Patches/0036-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0036-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 2c358306a438d0788be1ea76c8d2506af0339b7c Mon Sep 17 00:00:00 2001 +From f24cf33ea473b8f916f320b7796aa3be623226c8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API @@ -38,7 +38,7 @@ index f7ce391..9cd8e9b 100644 Entity entity = (Entity) list.get(i); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d356e7e..1fd636c 100644 +index 9b2e06a..2fab7d1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch index 16847e1243..fabe45318b 100644 --- a/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch +++ b/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch @@ -1,11 +1,11 @@ -From a13398ce78acf3168b87dca55bbc1f09e98d9c13 Mon Sep 17 00:00:00 2001 +From 164ba15fd875a5e3baf333a5952f6688add05a6a 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 1cc4e47..a0634f8 100644 +index fe61577..42a2bea 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -659,11 +659,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch index d6fd72d853..f0bc6a84b0 100644 --- a/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From 36684b471f15cbc884e2ffadcaf4939ca4b7b11f Mon Sep 17 00:00:00 2001 +From 45d9f27909e258188a9bf3e170e720c704783c96 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/0039-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch index 8224dc8183..9364b96bce 100644 --- a/CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch @@ -1,4 +1,4 @@ -From 2fb345e4d4a21458d0ca773fc34ee524f4c8eb81 Mon Sep 17 00:00:00 2001 +From 8ad8cfeb5ef3607ff7df88c3418e482344e46055 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/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch b/CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch index 9ef93c4330..7ba86fbbfc 100644 --- a/CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch +++ b/CraftBukkit-Patches/0040-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch @@ -1,4 +1,4 @@ -From c58898dd419d22d44ad3d407eadd11262917522d Mon Sep 17 00:00:00 2001 +From b4a7cd5471a376e966c3219af2ca080129a620e4 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/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch b/CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch index 4f293cd85d..734824dea1 100644 --- a/CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch +++ b/CraftBukkit-Patches/0041-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch @@ -1,4 +1,4 @@ -From b1984765de72f5464d00e8041ba7244daf960397 Mon Sep 17 00:00:00 2001 +From 91a59b2aec6c0edbab9254c6e0aa0aa3e7fef12c 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/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch index e500410a6f..afa553c740 100644 --- a/CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch +++ b/CraftBukkit-Patches/0042-Allow-Disabling-of-1.6.3-Structure-Saving.patch @@ -1,4 +1,4 @@ -From df701f7e9d4f96e779b7a928cfa5600f63475886 Mon Sep 17 00:00:00 2001 +From f958fcbb5a38d213f7f2d55d7861f3ccc5b5ce6d 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/0043-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0043-Item-Despawn-Rate.patch index f2a9f80a3d..ce28bd48ea 100644 --- a/CraftBukkit-Patches/0043-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0043-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From d1c7dec33fba2fb2a07abf7d74c239e4f20e58b8 Mon Sep 17 00:00:00 2001 +From 307fc1c27db419c44b46bac8e3c45075559762cf 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/0044-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch index fda08b6421..8ebf8c3d73 100644 --- a/CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0044-Don-t-Special-Case-X-Move-Value.patch @@ -1,11 +1,11 @@ -From dd6954ab95714be55cfec586216f0561e4905d3a Mon Sep 17 00:00:00 2001 +From e77ef424971b9cc45485367ec4a7a0eef3e70da0 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3904a80..f86f09a 100644 +index 8cf0b71..0d45439 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -111,6 +111,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0045-Implement-respawn-API.patch b/CraftBukkit-Patches/0045-Implement-respawn-API.patch index b3cdd5526a..1fc5e98f04 100644 --- a/CraftBukkit-Patches/0045-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0045-Implement-respawn-API.patch @@ -1,4 +1,4 @@ -From 34ce2fb1acc2f55ff365ac51faa4f6ef202a7997 Mon Sep 17 00:00:00 2001 +From 902b948750e522a34c9b0837d2d0e308fd6a05f3 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/0046-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch index cf39903b9a..9b3fa161a8 100644 --- a/CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0046-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 67f884819439a51b10a77eeb39c3a44ff12354df Mon Sep 17 00:00:00 2001 +From faeb947ab741cda6e6e98978de18a6a1b6940d16 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/0047-Fix-packed-ice-generation.patch b/CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch index 0857f47ba8..85dad7a9db 100644 --- a/CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch +++ b/CraftBukkit-Patches/0047-Fix-packed-ice-generation.patch @@ -1,4 +1,4 @@ -From b60d99eed5bc5e599fb908aaf00a26e5456c4a38 Mon Sep 17 00:00:00 2001 +From 81d520fd1ca0268598fd90138eac3b4cd3dc4a29 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/0048-Watchdog-Thread.patch b/CraftBukkit-Patches/0048-Watchdog-Thread.patch index 1b4e137fc5..e0363fd264 100644 --- a/CraftBukkit-Patches/0048-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0048-Watchdog-Thread.patch @@ -1,14 +1,14 @@ -From 7e4e39b4753cc3b320d449991267f354ffd29eb4 Mon Sep 17 00:00:00 2001 +From 18d05e9dbd7e0275546b0d0332c63d303d614360 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 5 Aug 2014 17:20:19 +0100 Subject: [PATCH] Watchdog Thread. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 3d5801c..33b69c1 100644 +index 948a2f6..7714dcb 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -271,7 +271,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -270,7 +270,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } // CraftBukkit end @@ -18,7 +18,7 @@ index 3d5801c..33b69c1 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 a0634f8..270d318 100644 +index 42a2bea..054a269 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -569,6 +569,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch b/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch index 4026348c19..94a4599643 100644 --- a/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch +++ b/CraftBukkit-Patches/0049-Clear-Flower-Pot-on-Drop.patch @@ -1,4 +1,4 @@ -From 7296edaa1cb0aed224ca1236d4a1a6bdb38a17fb Mon Sep 17 00:00:00 2001 +From d60fd451c6d5fc23094f8323735234ab64028dd7 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/0050-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch index 0bf115e30c..71b023eee3 100644 --- a/CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch +++ b/CraftBukkit-Patches/0050-Fix-some-chunks-not-being-sent-to-the-client.patch @@ -1,4 +1,4 @@ -From f4f1f5df831c99edd7cb8546ac56bd4d75909655 Mon Sep 17 00:00:00 2001 +From 41a87da3590d7d0dcdf8a0f9ca2a97e47d8a337b 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/0051-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch index a98862cea8..4f90fd5749 100644 --- a/CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0051-Fix-Broken-Async-Chat.patch @@ -1,4 +1,4 @@ -From c0112295cbbcacd4c9b4ff1a64ac61de98b2778d Mon Sep 17 00:00:00 2001 +From fd55dcc3befd0b3ec8d3ab3c4f1f9e0c0d76fdb3 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/0052-Orebfuscator.patch b/CraftBukkit-Patches/0052-Orebfuscator.patch index 7b0a2fb371..8918fdbe2b 100644 --- a/CraftBukkit-Patches/0052-Orebfuscator.patch +++ b/CraftBukkit-Patches/0052-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 87928bb1ce8d5547d586ec23cbf91ea502e22f99 Mon Sep 17 00:00:00 2001 +From 4968c35def64e0c307488ea32d479d7536020434 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -79,7 +79,7 @@ index 63b90f7..10c0e34 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 0301fba..7a84a95 100644 +index f2a9809..6dcf611 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -197,6 +197,7 @@ public class PlayerInteractManager { diff --git a/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch b/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch index dd1f9d5a59..ad2fd2b87b 100644 --- a/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch +++ b/CraftBukkit-Patches/0053-Optimize-DataWatcher.patch @@ -1,4 +1,4 @@ -From edb9783da1c312bc10c43a07095bddf53935e043 Mon Sep 17 00:00:00 2001 +From 8e9ad5ba6b0da9211d0935a35cf869e18347127f 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/0054-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch index 0e3ad689d3..170db4e7a3 100644 --- a/CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0054-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,4 +1,4 @@ -From c948544e80b194dd53b68464dc3b120549323a40 Mon Sep 17 00:00:00 2001 +From f028d32e2c3bdbdba4b9d8fedd470f3cfe095398 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/0055-BungeeCord-Support.patch b/CraftBukkit-Patches/0055-BungeeCord-Support.patch index 34325e29d8..df6184838e 100644 --- a/CraftBukkit-Patches/0055-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0055-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From b258124c6b30ae28bd727f320a39f80ad23e03a2 Mon Sep 17 00:00:00 2001 +From 93067185017bb7bcd1f431b3fc5d466b2aff8515 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support Provides support for IP forwarding via BungeeCord. diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index b34a59a..e5f1f7f 100644 +index d0374d0..8a6ef45 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -7,6 +7,7 @@ import java.util.HashMap; @@ -45,7 +45,7 @@ index b34a59a..e5f1f7f 100644 } break; diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index b936fb3..98eac81 100644 +index 1fa9626..541cec7 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 @@ -144,7 +144,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 7b2d8d1..7fead36 100644 +index 665d58e..0dcf37e 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/0056-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch index 60bccb4e98..a4f0cecde5 100644 --- a/CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0056-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From 11387329e86dce40ba8c4c7880c7634b5d52b28f Mon Sep 17 00:00:00 2001 +From ef2d58c831e84ea077a99a67888aec302db80394 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/0057-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch index 2f120b1f33..b40703c2b1 100644 --- a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From 24af97a358f9850ec1f6ac4c1b44ac83d61db631 Mon Sep 17 00:00:00 2001 +From be81b1a2a4b43c145bdaddbe15bff4f9121645f0 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 270d318..6c6f465 100644 +index 054a269..b3d89c1 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 diff --git a/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch b/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch index 950accf1eb..4033025ea8 100644 --- a/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch +++ b/CraftBukkit-Patches/0058-Prevent-Mineshaft-Saving.patch @@ -1,4 +1,4 @@ -From 73905dd9c8dc0033a23ec2aec3bccffe86612863 Mon Sep 17 00:00:00 2001 +From 8aee9e77f8557e093deb7e6632ecc4dd8627a4c9 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/0059-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch index 6e0faa4de0..321c994f0a 100644 --- a/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,11 +1,11 @@ -From d5949a9c9b33d98719a85a290047bb5f9b4cbe52 Mon Sep 17 00:00:00 2001 +From fc49ad64d8ae0dc5e4dfc2c5a00541dcb17431dc 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 6c6f465..c09a05e 100644 +index b3d89c1..ab9bb09 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -550,6 +550,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0060-Particle-API.patch b/CraftBukkit-Patches/0060-Particle-API.patch index a593fb298b..5092ac1b55 100644 --- a/CraftBukkit-Patches/0060-Particle-API.patch +++ b/CraftBukkit-Patches/0060-Particle-API.patch @@ -1,4 +1,4 @@ -From cbae29782927717ec9ccde7e4f14a1fef9b983c5 Mon Sep 17 00:00:00 2001 +From 02d65ac1109247f296b2e3d6dd33070c343fedc2 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/0061-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch index 6dfdb8fc11..96f23296bd 100644 --- a/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0061-Save-ticks-lived-to-nbttag.patch @@ -1,4 +1,4 @@ -From c16e15a3678f6ca208cbde4d6630ec51a22528a6 Mon Sep 17 00:00:00 2001 +From 7a845c3b5215c05f955a4a69511428b35bc245ec 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/0062-More-Efficient-GetCubes.patch b/CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch index 7827bed81d..e639ca6a96 100644 --- a/CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch +++ b/CraftBukkit-Patches/0062-More-Efficient-GetCubes.patch @@ -1,4 +1,4 @@ -From 8317a3fbd72cb6731287d8df185ff7a8938c16ce Mon Sep 17 00:00:00 2001 +From 99507859014f932c1d4c637c3a02008d1bd70a18 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/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index 011e9feeaf..09fa19e0f2 100644 --- a/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0063-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From d69ad84a9b9497da1a7b45a6de8742a714bcb2c5 Mon Sep 17 00:00:00 2001 +From 9a50d12977caba8b57ad46c3b22dcc7318ff7231 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/0064-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch index 4448bf9594..e92658ab15 100644 --- a/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch +++ b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch @@ -1,4 +1,4 @@ -From 50da834cc12577609c21d18eb8aba1940e1e8ec4 Mon Sep 17 00:00:00 2001 +From 2d6caad78d93dcf69a495a49d774d24e2929730c 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/0065-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch index 639792acdf..e3c37c4619 100644 --- a/CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch @@ -1,4 +1,4 @@ -From 2a802d0791cb9e2658807671a7d3092ab2fef28b Mon Sep 17 00:00:00 2001 +From f5f64db9caf06e7acd5697cb5e01bc533cda1ac2 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/0066-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch index 7f17216ec7..65cbfdda64 100644 --- a/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From a851c0d8d864636e9d4fbb63e28af2ed162a8675 Mon Sep 17 00:00:00 2001 +From 93e9dc8adcc418a1a59183f2b42a7446977b96a3 Mon Sep 17 00:00:00 2001 From: slide23 Date: Fri, 20 Dec 2013 20:15:33 -0600 Subject: [PATCH] Add Late Bind Option @@ -6,10 +6,10 @@ Subject: [PATCH] Add Late Bind Option Add late-bind config option to delay binding until loading is done. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 33b69c1..8b9c1ef 100644 +index 7714dcb..def9dea 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -174,6 +174,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -173,6 +173,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer this.a(MinecraftEncryption.b()); DedicatedServer.LOGGER.info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.R()); @@ -17,7 +17,7 @@ index 33b69c1..8b9c1ef 100644 try { this.aq().a(inetaddress, this.R()); } catch (IOException ioexception) { -@@ -182,6 +183,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -181,6 +182,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?"); return false; } @@ -25,7 +25,7 @@ index 33b69c1..8b9c1ef 100644 // Spigot Start - Move DedicatedPlayerList up and bring plugin loading from CraftServer to here // this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit -@@ -271,6 +273,17 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -270,6 +272,17 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } // CraftBukkit end diff --git a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch index 4dfe6f06a8..54186a40cf 100644 --- a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch @@ -1,11 +1,11 @@ -From 85d94ac5966d8c8464ab51fe828013a4a23b4207 Mon Sep 17 00:00:00 2001 +From b665d148f313bb73355a179f32960a9b65b6fa73 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/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java -index 97c3e79..dc1dffb 100644 +index 46845cd..22c2ffd 100644 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java @@ -31,6 +31,14 @@ public class ServerStatisticManager extends StatisticManager { diff --git a/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch b/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch index fd6e4bb1c7..235cb4bbb4 100644 --- a/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch +++ b/CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch @@ -1,4 +1,4 @@ -From 22f8c3151f8726503d2ec1b1b1c5e2b792d89526 Mon Sep 17 00:00:00 2001 +From 184a2262511dd37ff81d4fbbdf9b8e33498ce7cc 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/0069-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch index 84fa1a40a7..f2a0bf8620 100644 --- a/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,11 +1,11 @@ -From 8975b3c027edb2d69e9912526b57137f402edd0d Mon Sep 17 00:00:00 2001 +From cdbd805f597fc3d83bbe2f17e0a86e370a5977cf 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 c09a05e..f331f41 100644 +index ab9bb09..43ef181 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -745,7 +745,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch index 8cbfa80d2f..c9315b4334 100644 --- a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 906b1664a3c1d0afafbf48e0f399389943eac0be Mon Sep 17 00:00:00 2001 +From 010f2388c126b6770595d89ffd8694bad89c568b 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,7 +24,7 @@ index 5208dbc..f8bfc2d 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f331f41..d34c4e9 100644 +index 43ef181..7060622 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -657,7 +657,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index 7f79a737c2..cae0274b0b 100644 --- a/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0071-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,4 +1,4 @@ -From fa21783447705aa61405d57413882a1973c38907 Mon Sep 17 00:00:00 2001 +From 18c096c98465377a05941c51d047a678f5dfc39b Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 20 Jan 2014 13:44:07 +1100 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays. diff --git a/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index 30196d0397..79732653be 100644 --- a/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0072-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From e627892badb9a4b39285375080ef679a8939550c Mon Sep 17 00:00:00 2001 +From 0e03c1c520dd6f1085cdcaeca6ec2c3b15db0c95 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks diff --git a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch index 7edd93ac02..8a01c715f0 100644 --- a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From e535e5c1bba5c213865a477e6672281b764971e9 Mon Sep 17 00:00:00 2001 +From 140f63aafc48a95fc4925bca78e040df1431f13d 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 892d907..e3d4a07 100644 +index 7060622..b61af44 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 @@ -36,7 +36,7 @@ index 892d907..e3d4a07 100644 try { if (this.init()) { @@ -513,38 +526,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs - this.r.setServerInfo(new ServerPing.ServerData("1.8.5", 47)); + this.r.setServerInfo(new ServerPing.ServerData("1.8.6", 47)); this.a(this.r); + // Spigot start diff --git a/CraftBukkit-Patches/0074-Add-Spigot-Links.patch b/CraftBukkit-Patches/0074-Add-Spigot-Links.patch index 5a537f8005..ccddc4be09 100644 --- a/CraftBukkit-Patches/0074-Add-Spigot-Links.patch +++ b/CraftBukkit-Patches/0074-Add-Spigot-Links.patch @@ -1,4 +1,4 @@ -From 46678a89653b1021dde6354ca6974c76418c9923 Mon Sep 17 00:00:00 2001 +From 2bec629cc37f2636d125fd94a3ddfe247360a733 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/0075-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch index b73582d940..957cac640e 100644 --- a/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0075-Configurable-Ping-Sample-Size.patch @@ -1,11 +1,11 @@ -From 3535fbe78a648b3f4de686e9b4e3750c57a4c022 Mon Sep 17 00:00:00 2001 +From 6a38dcdbc7ba38400057409c290a8264a60fdd39 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/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index 8966bfb..b996558 100644 +index 285fd4b..684d4fa 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -113,6 +113,13 @@ public class PacketStatusListener implements PacketStatusInListener { diff --git a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch index 0631d7a348..dd557fb031 100644 --- a/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0076-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 85f0223660f58d7224bbfd7e7bf3e853638fcf69 Mon Sep 17 00:00:00 2001 +From 32339ec1d327a055f3bab4f9717d51264f46a724 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Add Optional Tick Shuffling This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order. diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 42188fa..931ab66 100644 +index 86b1f37..cfd4ca1 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -123,6 +123,13 @@ public class ServerConnection { diff --git a/CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch b/CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch index 71cb9045f8..ca72449315 100644 --- a/CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch +++ b/CraftBukkit-Patches/0077-Allow-Configuring-Chunks-per-Packet.patch @@ -1,11 +1,11 @@ -From d5cfbd51ff49e345b3d080b284e986dfb6e473ee Mon Sep 17 00:00:00 2001 +From 828bf8252b698beddc7c384d660cd9a8a7e158ee Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 28 Jan 2014 20:35:35 +1100 Subject: [PATCH] Allow Configuring Chunks per Packet diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 1fd636c..98b54fe 100644 +index 2fab7d1..b80fd6d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -223,7 +223,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch index ea94b5dcee..c38749f286 100644 --- a/CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0078-Implement-Locale-Getter-for-Players.patch @@ -1,11 +1,11 @@ -From 2b5c9c222bfb53b70c60b3b9d8b26512030f8b3f Mon Sep 17 00:00:00 2001 +From deeeff7aa324e4cd0be1f24621f53839fb8686f3 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 98b54fe..3ab1801 100644 +index b80fd6d..9447d35 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; diff --git a/CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch index c921d44325..c79e7afccc 100644 --- a/CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0079-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 886fe319aa0b17ffea9899275c07889b3346919e Mon Sep 17 00:00:00 2001 +From cb6e2bfdea8449916514608823faa660bbb7f385 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/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch b/CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch index b01e2e06e7..025bbf4852 100644 --- a/CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch +++ b/CraftBukkit-Patches/0080-Fix-dispensing-bone-meal-not-having-the-correct-data.patch @@ -1,11 +1,11 @@ -From 86eb3b6d91c8b107d33eacda6c688a929e1f9fe6 Mon Sep 17 00:00:00 2001 +From 558562c999dd7880361be5b35f8669411cfb36b7 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/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index f730e97..4d1c04e 100644 +index 37fd3f2..f91c33d 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java @@ -463,7 +463,7 @@ public class DispenserRegistry { diff --git a/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch index 9b701427e6..81f0ee5272 100644 --- a/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0081-Spam-Filter-Exclusions.patch @@ -1,11 +1,11 @@ -From 34bd1e6741ed279d9536df41fd39e2a8dbb04798 Mon Sep 17 00:00:00 2001 +From db5fb0bd7b0ae00c02177b774c7b362a471cd19d 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e46c600..dc395e1 100644 +index 0d45439..f3365ca 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -971,9 +971,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch index f6a2d24eb5..8e09f12519 100644 --- a/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0082-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 1d78f256c07f82478c4cab777dc2b1951e016baf Mon Sep 17 00:00:00 2001 +From e3c3d2ba531d02e52c8edd053482b612d6c009be 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/0083-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch index 443cb655a5..38921f0a51 100644 --- a/CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0083-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 0c71ffab145eea2dbaaf80597e04ec1aa88378bd Mon Sep 17 00:00:00 2001 +From 20ae0e2f740dee6e185b8369ffdb580035df77af 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/0084-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch index fd1b225e66..ae35e7682e 100644 --- a/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0084-Allow-Disabling-Creative-Item-Filter.patch @@ -1,14 +1,14 @@ -From 8e32d66728845bb6608ad877fe9c7237590694c8 Mon Sep 17 00:00:00 2001 +From 479c5a56c49ad5607bc55371a52a4bb83ea4ba12 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b92a51b..854fcf0 100644 +index f3365ca..f40c7c9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1709,7 +1709,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1697,7 +1697,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize(); // CraftBukkit - Add invalidItems check diff --git a/CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch index d68ffe34ed..f36cc0623d 100644 --- a/CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0085-Cap-Channel-Registrations.patch @@ -1,4 +1,4 @@ -From 316538f0307e343c7b236f4b9abaf3324368b565 Mon Sep 17 00:00:00 2001 +From 3522fd55c5aae8cee3851fc5a114b3a8b77c409c 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/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index 3def79bcb3..68994e07b7 100644 --- a/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0086-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,4 +1,4 @@ -From 9ef3b3f6584c113c485336e448a0e320478f0f18 Mon Sep 17 00:00:00 2001 +From 7fe22630471a1658dc748f921167c0d6de4e8093 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/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch index cfab68855f..03e0bfe36f 100644 --- a/CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch +++ b/CraftBukkit-Patches/0087-Unfinalize-the-isDisconnected-method-by-bukkit.patch @@ -1,4 +1,4 @@ -From 457868a34c767ff1cc08a7f490f6371ffcfb3ce7 Mon Sep 17 00:00:00 2001 +From 10f8d30f1edd380dbd27ee2ba67cd21d2f9e0203 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. @@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit. This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 854fcf0..a57fa47 100644 +index f40c7c9..a357d57 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2071,7 +2071,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -2059,7 +2059,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } // CraftBukkit start - Add "isDisconnected" method diff --git a/CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch index 82f56397bf..5d0b2a8906 100644 --- a/CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0088-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From ab8b89560a0152efbf8957614a8c1bc1b0480af9 Mon Sep 17 00:00:00 2001 +From e8405d7ec0d4d78f12d725388bab9a340478934f 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/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch index baf5513068..f14291ec0c 100644 --- a/CraftBukkit-Patches/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0089-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,4 +1,4 @@ -From 1a8013d61fb93b9d647874ba7cb9e7642bb220e3 Mon Sep 17 00:00:00 2001 +From 0f64e52709dc745b10ee7508a85aa29c0bc13f93 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/0090-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch index 1eeaa9fd55..b43afc2d83 100644 --- a/CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0090-Prevent-hoppers-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From a62a8c6910ee563d988c304a7549b7fc6dde24c6 Mon Sep 17 00:00:00 2001 +From 25cfc35dd3feae24765c75a864ee7492535ca09a 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/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 8e0d254..766f74e 100644 +index 6785b71..1553656 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -549,6 +549,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU diff --git a/CraftBukkit-Patches/0091-Guard-Entity-List.patch b/CraftBukkit-Patches/0091-Guard-Entity-List.patch index c00db7860e..d000d6805c 100644 --- a/CraftBukkit-Patches/0091-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0091-Guard-Entity-List.patch @@ -1,4 +1,4 @@ -From 9985b3c8eca0679b016de64987fdb7efac14b566 Mon Sep 17 00:00:00 2001 +From c3658266f9bd8d5329b301f27e7d7247ab3db559 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 09:03:28 +1100 Subject: [PATCH] Guard Entity List diff --git a/CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch index d066cdbdde..d42daf7ea9 100644 --- a/CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 627cefb0736a27110bbf2b434a37fd86d21a3742 Mon Sep 17 00:00:00 2001 +From c429811218fb9a028c5e08c3b31710cfb59bbb9b Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch index 2b4b681d3d..c097a394c4 100644 --- a/CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0093-Cancellable-WitherSkull-potion-effect.patch @@ -1,4 +1,4 @@ -From 5728fa581275b4ab2284a6b721567323d8a89524 Mon Sep 17 00:00:00 2001 +From 04650485c0f44261f9e40f7c2b9f7848dedefdcd 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/0094-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch index b8ec88e491..8c62698988 100644 --- a/CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0094-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,4 +1,4 @@ -From 00c8c5f870142ae3efac8c35e83b14e46bf10072 Mon Sep 17 00:00:00 2001 +From 2cb578d10684374acb4ecb61e03a7e49da5ea7d8 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! @@ -27,7 +27,7 @@ index 82accf4..d6bef0b 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a57fa47..fc280da 100644 +index a357d57..ceb2419 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -894,7 +894,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch index 6ab0cd400c..bca75878ef 100644 --- a/CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0095-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 6b7476ff90b5149f42652a389728558a65b15b31 Mon Sep 17 00:00:00 2001 +From 6e7a673650d54e56f37efc2a6a6ea74b54b21e2f Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 1f4010fba0..aaade37637 100644 --- a/CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0096-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From 274394202bcfc5682111788a0ed9ed0bb4cc8b6d Mon Sep 17 00:00:00 2001 +From ffe56e4a984cbf1a3b75e77c7d11aadee79e4e8e 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,7 +6,7 @@ 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 04874dd..0dbe68c 100644 +index b61af44..9af5a07 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1017,7 +1017,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch index c89086e10b..938c73beaf 100644 --- a/CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0097-Treat-Bungee-as-Online-Mode.patch @@ -1,4 +1,4 @@ -From be79f744090c1b996c8d497e1b5ee2902a78ba9c Mon Sep 17 00:00:00 2001 +From e6c8db61471487f373de9bfc6f0fd186874270bb 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/0098-Add-Conversion-Message.patch b/CraftBukkit-Patches/0098-Add-Conversion-Message.patch index 8edb5d66e8..ee65408736 100644 --- a/CraftBukkit-Patches/0098-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0098-Add-Conversion-Message.patch @@ -1,14 +1,14 @@ -From d29b9d3e1a42a524da1bd657afba35115af29577 Mon Sep 17 00:00:00 2001 +From dcc4abd6ded05fe6c4cb62a84112e793b7dfcf9c 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/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 8b9c1ef..9bba97b 100644 +index def9dea..76cc16d 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -517,6 +517,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -516,6 +516,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } protected boolean aR() { diff --git a/CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch b/CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch index d1fca1fa30..d2863f71fa 100644 --- a/CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch +++ b/CraftBukkit-Patches/0099-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch @@ -1,4 +1,4 @@ -From ac112d63cab52997d71ed72f324e2fd1725d7e33 Mon Sep 17 00:00:00 2001 +From a24497fba9dd2ad33cb2df29260da3b752bdad00 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/0100-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch index 9608ee737a..387dcb0eff 100644 --- a/CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0100-Print-Stack-on-InternalException.patch @@ -1,4 +1,4 @@ -From e8b7ffb38699e5c3ec0be74c4a12aa2a475c0e0f Mon Sep 17 00:00:00 2001 +From 05caf5119e25b4a9d2192a3af26af8df9528ef5d 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/0101-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch index 4639fbd225..10be233a97 100644 --- a/CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0101-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 483b6a7711678c96fd193b60d8cbc4f8e623be31 Mon Sep 17 00:00:00 2001 +From 1964974bd4ebb400169b5e41af330ca0a9f7eb33 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/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index 537dad0f5d..e9a58720ab 100644 --- a/CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0102-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,11 +1,11 @@ -From 174979c8f3bb1360fa9958fa3d0b04453824edae Mon Sep 17 00:00:00 2001 +From 2a33ccd140c05c3df0e88c5d6fd37db64bcd5744 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/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 39e4a16..71a0edc 100644 +index 78f1f57..021853e 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -142,7 +142,7 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch index a3dd3a360f..23ab3569fc 100644 --- a/CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0103-Check-for-blank-OfflinePlayer-Names.patch @@ -1,4 +1,4 @@ -From d38127d64dcbeb4c5293b998be89f534ca8516ab Mon Sep 17 00:00:00 2001 +From 6040e3cc1f18d33204f22bc7ed04681264943f0f 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/0104-Fix-Player-Banning.patch b/CraftBukkit-Patches/0104-Fix-Player-Banning.patch index 7991cc86f8..7fbeba6b31 100644 --- a/CraftBukkit-Patches/0104-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0104-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 2a9d6bb882ba7e0efd67954dfc1cb644987855cf Mon Sep 17 00:00:00 2001 +From ab7bcf8f475fd2b65a2c8b65c6bcdda0ab4850eb 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/0105-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch index ddc8b811c0..43c1668801 100644 --- a/CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0105-Fix-ban-expire-dates.patch @@ -1,4 +1,4 @@ -From 2b3f6b1be1dfcf482f15082702c10a1fe29add20 Mon Sep 17 00:00:00 2001 +From 1c46986e7612da9922567b5a1486996ae48d68ad 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/0106-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch index d9f7decb44..fca0e2a31c 100644 --- a/CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0106-Correct-Ban-Expiration.patch @@ -1,11 +1,11 @@ -From 4ae5cbb686d27576e4a9e69aee14e8a38a21f507 Mon Sep 17 00:00:00 2001 +From 3266fc204c9523dca5fe661412a1ab62567b5d2c 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 7fead36..9902a61 100644 +index 0dcf37e..686a632 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/0107-Convert-Horses-owner-to-UUID.patch b/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch index 169281670f..79503fe1df 100644 --- a/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch +++ b/CraftBukkit-Patches/0107-Convert-Horses-owner-to-UUID.patch @@ -1,4 +1,4 @@ -From 18aaf0292c9952426461b687fdfceaa3d1b38728 Mon Sep 17 00:00:00 2001 +From 4352457fa5237fa677dba605114cf42919315a55 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/0108-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch index fb4b7f1a34..2ab903e25f 100644 --- a/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch +++ b/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch @@ -1,4 +1,4 @@ -From a9834469302229f945a7bd8d5e7bf0985374dfb8 Mon Sep 17 00:00:00 2001 +From 2564a4f795b3ba3b8f211282e933b2c03e670cc5 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/0109-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch index a2c3a094f0..03cc95f801 100644 --- a/CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch +++ b/CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch @@ -1,4 +1,4 @@ -From e92208b06f24331eb606254e702b2715efe1d8e0 Mon Sep 17 00:00:00 2001 +From 4b01ba741f539605915bfb6ed79baf75b1730fd4 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/0110-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch index 211f07c2c6..6ea07922e5 100644 --- a/CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch @@ -1,14 +1,14 @@ -From ca0b6d0e8c376a6223579a495cca33d765583c3e Mon Sep 17 00:00:00 2001 +From c21304e88c5f05f474c2f6712e84fc188afa86d0 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/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 02c9250..0de85da 100644 +index b8d0961..c268a40 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java -@@ -225,7 +225,14 @@ public abstract class TileEntity { +@@ -229,7 +229,14 @@ public abstract class TileEntity { // CraftBukkit start - add method public InventoryHolder getOwner() { if (world == null) return null; diff --git a/CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch index c6b60a6600..c77b7ac3ba 100644 --- a/CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch +++ b/CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch @@ -1,4 +1,4 @@ -From aaa0df014eabaeb61e1e9154c4bfad3dfe1a884a Mon Sep 17 00:00:00 2001 +From 161fb596c2c9bf7210385465a01684617e3d9741 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/0112-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0112-Convert-player-skulls-async.patch index ddfa871d50..6b55f70c93 100644 --- a/CraftBukkit-Patches/0112-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0112-Convert-player-skulls-async.patch @@ -1,4 +1,4 @@ -From 85dccedb527d58d2683cd71623e06c47bcfa7672 Mon Sep 17 00:00:00 2001 +From 32d4495b672dfb5bc4a79ab1fcbdd167fcff7b90 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/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index e3aaa6e97f..37bbeedcc4 100644 --- a/CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,4 +1,4 @@ -From b7457c9891261dd6e5463ff2a75dff704fe98b0d Mon Sep 17 00:00:00 2001 +From 6187e07d8919fe778e4943406782200a44cc4c5b Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/CraftBukkit-Patches/0114-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0114-Check-Skull-canPlace.patch index 7b8414eb89..879a9414e1 100644 --- a/CraftBukkit-Patches/0114-Check-Skull-canPlace.patch +++ b/CraftBukkit-Patches/0114-Check-Skull-canPlace.patch @@ -1,4 +1,4 @@ -From 7d686f41eb826f161815614c9385a544fd734692 Mon Sep 17 00:00:00 2001 +From 12ddf21a211853e5594ea9469e119281d3a5b329 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/0115-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch index 8f05c4a782..90094c621a 100644 --- a/CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From 6c36f9e1b3eb083bd511ce69dd8d6b6313406cb6 Mon Sep 17 00:00:00 2001 +From 7a601109dc28da7f022dced48416bf8a1d76ab41 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 @@ -44,7 +44,7 @@ index 27f1d0a..8430a46 100644 this.channel.close(); // We can't wait as this may be called from an event loop. this.n = ichatbasecomponent; diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 931ab66..2708d64 100644 +index cfd4ca1..f13182c 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -137,6 +137,10 @@ public class ServerConnection { diff --git a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch index a2d417efbf..f4fb6fe41e 100644 --- a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch @@ -1,11 +1,11 @@ -From 6ff4caaa7418837d61d41135d1253b1b02b22e46 Mon Sep 17 00:00:00 2001 +From d7e6fed853926571a63f8c90315f252ea09ce412 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/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 71a0edc..41e297f 100644 +index 021853e..31b4e81 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -208,7 +208,7 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch index 083b5199f4..8021b3cbf2 100644 --- a/CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch @@ -1,11 +1,11 @@ -From abf8eda955f99d7842678561f46d057addd1f640 Mon Sep 17 00:00:00 2001 +From 3c242f100cf55d40bfebcefda6c87a8760834445 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 9902a61..4e78341 100644 +index 686a632..a88be23 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/0118-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch index 6edda9dc52..6650111fb6 100644 --- a/CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From 604ea346f15eb6c4f772640ef3a0a633a362c15d Mon Sep 17 00:00:00 2001 +From 1cbaf4b56eb551cc0a8614a01f90a032ff8ee6cc 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/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch index 717a61d143..f0c92a64dc 100644 --- a/CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From cde15c0e44297ed0baecaab3b6738427f6fa03fd Mon Sep 17 00:00:00 2001 +From 28abd81b8d9352989e362304b07e482c9980ced0 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ddd03f5..5aff880 100644 +index ceb2419..0c095c9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -956,7 +956,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch index a89ade6201..60187151ce 100644 --- a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,11 +1,11 @@ -From c06e01709cb85b4d1317028a5e362c3ee24bf43f Mon Sep 17 00:00:00 2001 +From e5b7581e6b9e2c21dd3a8e45b153229f5d34eab4 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 0dbe68c..17dbe9f 100644 +index 9af5a07..a951bc9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -489,7 +489,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -24,7 +24,7 @@ index 0dbe68c..17dbe9f 100644 } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 41e297f..6f464be 100644 +index 31b4e81..72154d4 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -149,7 +149,7 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch index 9dd1951ea6..b866d2c4a8 100644 --- a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch +++ b/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch @@ -1,4 +1,4 @@ -From 84a067c62c724b0c4b376cb6aa0ba0f94a2a9330 Mon Sep 17 00:00:00 2001 +From 366f02b348c73826f2c25a41263128e6a4c85370 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/0122-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch index 4fd0bc7441..f7cb72fa8c 100644 --- a/CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch +++ b/CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch @@ -1,4 +1,4 @@ -From cd1a37fa59c34f7ebc5506b1878460d71d47b384 Mon Sep 17 00:00:00 2001 +From 32ec016f638bb49d395f6a38840da0d0142b1a05 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/0123-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch index 51ba8b036e..24649ddd04 100644 --- a/CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From d28402786a1663f14fce8845322c7f5db10161b9 Mon Sep 17 00:00:00 2001 +From 3a1d0cc42f3a816457fc4a8f2218cad5bfdaa62f 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/0124-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch index af3510a456..7f4ff9e0de 100644 --- a/CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch @@ -1,11 +1,11 @@ -From c620fb272cc4d300b0507a23895288e3569be0d1 Mon Sep 17 00:00:00 2001 +From c43b4f0ff90f4acfd68c78fff336323de82178cf 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/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java -index 920d4ec..639c59b 100644 +index c611db1..28cb5e3 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java +++ b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java @@ -4,9 +4,13 @@ import java.io.IOException; @@ -24,7 +24,7 @@ index 920d4ec..639c59b 100644 public void b(PacketDataSerializer packetdataserializer) throws IOException {} diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5aff880..3a3ebfd 100644 +index 0c095c9..2469f48 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -628,9 +628,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0125-Better-item-validation.patch b/CraftBukkit-Patches/0125-Better-item-validation.patch index b7a89f9861..8c52c2f2f0 100644 --- a/CraftBukkit-Patches/0125-Better-item-validation.patch +++ b/CraftBukkit-Patches/0125-Better-item-validation.patch @@ -1,4 +1,4 @@ -From db3153ad7ba5dee206761df0d08b82e73a03868b Mon Sep 17 00:00:00 2001 +From f796a42fe3d389abc18238e7c6b71a0c58c3af69 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/0126-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0126-Further-Seed-Customisation.patch index d2ae921629..b705a69456 100644 --- a/CraftBukkit-Patches/0126-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0126-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From 5deaed19e977732ddc3b7387a6a33c42091291e6 Mon Sep 17 00:00:00 2001 +From ec81c7e34b486cb618282f7d04ed00b909622c20 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/0127-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch index 83ac5005ca..b18dc154d1 100644 --- a/CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch +++ b/CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch @@ -1,4 +1,4 @@ -From 20494e2a76f3b8be5bbf522c6a813b911bbc91f8 Mon Sep 17 00:00:00 2001 +From da5e7a60d7367e9f35af3ad977c6e2fc1148570a 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 17dbe9f..517c4c2 100644 +index a951bc9..8b95e59 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/0128-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch index 6dd6259bee..67e7277687 100644 --- a/CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch +++ b/CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch @@ -1,4 +1,4 @@ -From 84aa7c1645966957f4ec04363412db28cea1b7f3 Mon Sep 17 00:00:00 2001 +From e650175d8ae7c08174bb6d29fb0eccf193800932 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/0129-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0129-Safer-JSON-Loading.patch index 24c81c92fe..73315a7918 100644 --- a/CraftBukkit-Patches/0129-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0129-Safer-JSON-Loading.patch @@ -1,4 +1,4 @@ -From e661cafe08b0bc2edbb88d8376cfa3e5c7dd8a88 Mon Sep 17 00:00:00 2001 +From 833b73d4c5e179449cdadc2fe7c32fd83a92cf67 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading @@ -27,7 +27,7 @@ index f5c3aae..8e4ecfd 100644 IOUtils.closeQuietly(bufferedreader); } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 6f464be..e95d93f 100644 +index 72154d4..ebcc49d 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -199,6 +199,11 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch index 0792e8c4bb..eb6184d8fc 100644 --- a/CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch +++ b/CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch @@ -1,4 +1,4 @@ -From 5019b35b4b5a8af507d9fb44b44e9cec0b7e098b Mon Sep 17 00:00:00 2001 +From ea093f5f64763bd5fb4d31c9f0795073cf38ca0c 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/0131-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch index 3bef17c76d..0dcf38a316 100644 --- a/CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From d3aff1201d5ea51e44a6c6b1e34aef7fdb2678cb Mon Sep 17 00:00:00 2001 +From f32a9920cf444a9803fc041d2de0f49486564d29 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 @@ -8,10 +8,10 @@ This flag contains the same message as eula.txt (albeit with proper grammar for This feature only exists for hosting companies and people who manage servers in bulk who wish to agree to the terms by setting a flag in a script. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 9bba97b..99920b0 100644 +index 76cc16d..ebb18c6 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -124,7 +124,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -123,7 +123,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer DedicatedServer.LOGGER.info("Loading properties"); this.propertyManager = new PropertyManager(this.options); // CraftBukkit - CLI argument support this.p = new EULA(new File("eula.txt")); diff --git a/CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index c4b5d0f145..509427a705 100644 --- a/CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From 9645888aa9221d2b98d8005e45029a7dfd23cf23 Mon Sep 17 00:00:00 2001 +From 41f2230ba8fcd520bd55fc2feb74544ccb4557ef 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/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 0fa0507e62..27d6098faa 100644 --- a/CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From 5dc1fb32f125bad447fa11b195e6aa979b9a91ff Mon Sep 17 00:00:00 2001 +From cf4417feddf83beb2b4a607975ca24287b871031 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/0134-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch index 49063b4f97..22fcf43117 100644 --- a/CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch @@ -1,4 +1,4 @@ -From d4c66f8778c098c3f11cce5f44deb3d776f88155 Mon Sep 17 00:00:00 2001 +From b55560bcefc38649df64183e9a01462208e3601f 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/0135-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch index 008698aef9..6002adaab6 100644 --- a/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch @@ -1,11 +1,11 @@ -From 9fc09c3b5b09ce4f86af0dbf88cf291e49a04e83 Mon Sep 17 00:00:00 2001 +From b4722530694ee61c1ebed13ba1c0e550e62fbbd6 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 4 Jul 2014 23:03:13 +0200 Subject: [PATCH] Make "moved wrongly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9c1da26..b0e34c1 100644 +index 2469f48..3fe7038 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -417,7 +417,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch index fe807657a6..e4a5183df0 100644 --- a/CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch @@ -1,4 +1,4 @@ -From c2d63b92ab2f8970077a4fe611b7a68f0c278215 Mon Sep 17 00:00:00 2001 +From 0afdaf18e32361170492c4ec0d4c490caaaf5d20 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch index bb08e8e4d2..3e8da652d3 100644 --- a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch @@ -1,11 +1,11 @@ -From 8130f62a18f9d0948bff75ac8d3234d4b78abc4e Mon Sep 17 00:00:00 2001 +From f6c0aaefac6ec26633afb1c02fef8adc2e5e0c7a Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 22 Jul 2014 15:59:01 +0200 Subject: [PATCH] Make "moved too quickly" limit configurable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b0e34c1..9580cd4 100644 +index 3fe7038..ccb21ed 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -390,7 +390,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch index aaea6bfa9f..4aa8d0c7e7 100644 --- a/CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch @@ -1,4 +1,4 @@ -From 851cff2f81336b2bf44741a737eb5fe3258245ad Mon Sep 17 00:00:00 2001 +From d3b40c4783d20d064464ff8d5f963fa807565c1b 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/0139-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch index fbd4550674..3fb92dba0f 100644 --- a/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From d3950eb31a9ee39be9d5f8e6ee59a3b970e258dd Mon Sep 17 00:00:00 2001 +From 3195bf83838b1ae725960fc7e3a5fec31a1563fb 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/0140-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch index 41f04fb23e..d6c9f2a2e5 100644 --- a/CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From 33a244d0cbd0bb38bdb5e7b5368c66a745815148 Mon Sep 17 00:00:00 2001 +From f1e25e4a01135d868f568daa0ac749601ae3b59d 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/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch index 3bfa0c6300..59951e83d5 100644 --- a/CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 433109c08ea4c9c4e819f1053f38c85e22610dcf Mon Sep 17 00:00:00 2001 +From 9699ad5e050b3efc2af63c2bcd2568d4c300dfaf 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/0142-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch index 401e2b3dc4..03dd7267c4 100644 --- a/CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch @@ -1,4 +1,4 @@ -From 75f119e1617fcf060a3881c9082456c3ea0e48c6 Mon Sep 17 00:00:00 2001 +From efbdf11c3b689e1d1197ea71e2157c9d3af7b126 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak diff --git a/CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch index 73401301a1..e111ad05f4 100644 --- a/CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From decc3539602a4069f15084219e3b984a365beb17 Mon Sep 17 00:00:00 2001 +From 6349c3ae7b6e662d7aded972ea4b2c3741e046f8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest diff --git a/CraftBukkit-Patches/0144-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0144-Remove-uneeded-validation.patch index 8dc883b83c..ca064a9e04 100644 --- a/CraftBukkit-Patches/0144-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0144-Remove-uneeded-validation.patch @@ -1,11 +1,11 @@ -From cfd887d24911b0a34b7357bfc294480c08c5c024 Mon Sep 17 00:00:00 2001 +From 3f34e4ee12532910b03a8285c717349bd5659373 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/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index dbdd47d..6c4c524 100644 +index 736aa69..9a8820b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -239,7 +239,7 @@ class CraftMetaItem implements ItemMeta, Repairable { diff --git a/CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch index d1be31fb32..e37cefd89d 100644 --- a/CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch @@ -1,4 +1,4 @@ -From 2a8a6440644da74aab591456902e6edd1342a5bd Mon Sep 17 00:00:00 2001 +From 2489aa2e712dd6beb634472dfedf704218a706ad 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/0146-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch index 36d294069a..400923ffcb 100644 --- a/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch @@ -1,4 +1,4 @@ -From f8303bfc0941d224b0ea14aa091c8905235cdd75 Mon Sep 17 00:00:00 2001 +From 30e37ea979d293681e83f54326614f7d49259c72 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/0147-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch index 69acc0d625..7b261b8cc6 100644 --- a/CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch +++ b/CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch @@ -1,4 +1,4 @@ -From 4bff08a9b1bec34cbb52a22c7ae5d2024d4ea6d3 Mon Sep 17 00:00:00 2001 +From 2417ba6cf39bd3a085012e939030e3c6bcceb101 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 @@ -8,7 +8,7 @@ CraftMetaItem would add a null enchantment into the enchantment map which causes NullPointers later diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 6c4c524..74cb365 100644 +index 9a8820b..e57431f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -460,7 +460,11 @@ class CraftMetaItem implements ItemMeta, Repairable { diff --git a/CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch index 5487217b8f..76fb8fe00e 100644 --- a/CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From 78603e464ee15fff258269a9a24612b4474d28e4 Mon Sep 17 00:00:00 2001 +From 321c9040552cca47a7d72795f13e551bcf290287 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 diff --git a/CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index 485fa5ab66..0b2f19fc95 100644 --- a/CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,11 +1,11 @@ -From 4637d21df3a5017ba03c8c789909ee43fd2ccbcc Mon Sep 17 00:00:00 2001 +From 991e55cb31f9b37642033e6b8f0bab2a851344f6 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/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 74cb365..5580404 100644 +index e57431f..75f81ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -217,6 +217,8 @@ class CraftMetaItem implements ItemMeta, Repairable { diff --git a/CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch index 65aa15ef98..ace8a69c98 100644 --- a/CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From 3d18bab0480aef5e09b13721276144d8e52af007 Mon Sep 17 00:00:00 2001 +From 1361ee7a57caeda4afe9e12b8474f7dcf06601b8 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/0151-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch index fac66a0118..129262c9c5 100644 --- a/CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch +++ b/CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch @@ -1,4 +1,4 @@ -From 4a22cce4810d6177216abdaf00be1538375ae316 Mon Sep 17 00:00:00 2001 +From becc7744e642d615743a11637894f462cae2a8b3 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/0152-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch index 87913f5b3e..08d6df9aa6 100644 --- a/CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From c7a29c493f41794ec59e0d628bc41cef29985f0a Mon Sep 17 00:00:00 2001 +From 88328b7b3d3969c871aaa8b75e22d81ce5e1dc07 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/0153-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch index 5148d3b433..eae8b307be 100644 --- a/CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch @@ -1,4 +1,4 @@ -From e90cd00de38eca3c597846015b3eeca31c16ffb5 Mon Sep 17 00:00:00 2001 +From 89545c6308f2c4f78ba8e76d528d25518129dc6a 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/0154-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch index 2112fdecd4..2b85ea97a8 100644 --- a/CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 54ad33cb6023b4bead3ff222395954f8562a0372 Mon Sep 17 00:00:00 2001 +From 5a8fa8fc3ffc90de82ea5bb9cfb90dfa1c26d1aa 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. diff --git a/CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch index 472f35e159..13f46b4f03 100644 --- a/CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch +++ b/CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch @@ -1,4 +1,4 @@ -From 5423a988112f146cd6249bad0b65e8e5f0c7bd1d Mon Sep 17 00:00:00 2001 +From e5788893cca9684a0ae5a54bc56567c3a2d8b85f 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 diff --git a/CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch index 30c29ea4c8..0fcbcccf5c 100644 --- a/CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch +++ b/CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch @@ -1,11 +1,11 @@ -From fbac64f81dab23bd878125a77e249a6cda0ea99a Mon Sep 17 00:00:00 2001 +From 1f925e84e012fe5971f7811c32c597bc0f8f96fa Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 Apr 2015 09:19:39 +1000 Subject: [PATCH] Use CLQ for main thread tasks. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 517c4c2..7580b47 100644 +index 8b95e59..811dcf1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -104,7 +104,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs