diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 79eddf25..7cb3c415 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 7e450808642481b9b91d86caf7ac86f299cdf862 Mon Sep 17 00:00:00 2001 +From 407541257ac25d8a801c49d7164975e0d9a61560 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 08e0c515..a53bb3dd 100644 +index 85ae8108..75469885 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ @@ -16,7 +16,7 @@ index 08e0c515..a53bb3dd 100644 - bukkit + org.spigotmc + spigot-api - 1.13-pre7-R0.1-SNAPSHOT + 1.13-R0.1-SNAPSHOT jar - Bukkit diff --git a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch index bfba62fa..dbc4504e 100644 --- a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From cec75be1115b2741ea1a77572dd3222867af17e8 Mon Sep 17 00:00:00 2001 +From e509a9dbfc12a6f121e9dcba76b0c012f5faf99a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 15 May 2017 15:16:15 +1000 Subject: [PATCH] Skeleton API Implementations diff --git a/Bukkit-Patches/0003-Spigot-Timings.patch b/Bukkit-Patches/0003-Spigot-Timings.patch index 37a2a381..de7720e8 100644 --- a/Bukkit-Patches/0003-Spigot-Timings.patch +++ b/Bukkit-Patches/0003-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 1a8095ed9b3e3f7492886a5766626b3df85b8abd Mon Sep 17 00:00:00 2001 +From 1dbcb6a2878aa7f8179a87405c83a0c7d000343a 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/0004-Add-PlayerItemDamageEvent.patch b/Bukkit-Patches/0004-Add-PlayerItemDamageEvent.patch index 53fa8525..2c3871aa 100644 --- a/Bukkit-Patches/0004-Add-PlayerItemDamageEvent.patch +++ b/Bukkit-Patches/0004-Add-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 2c4aae37e35e940afef4cfee33551f7b69d2912a Mon Sep 17 00:00:00 2001 +From fd1dc5a5526c7d812bd29d23950cb53101b41b71 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 4 Mar 2013 18:31:20 +1100 Subject: [PATCH] Add PlayerItemDamageEvent diff --git a/Bukkit-Patches/0005-BungeeCord-Support.patch b/Bukkit-Patches/0005-BungeeCord-Support.patch index 7ca0ab48..b41fbb02 100644 --- a/Bukkit-Patches/0005-BungeeCord-Support.patch +++ b/Bukkit-Patches/0005-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From f49b3b2e2b6361836edd5b737f54c26bd3f43a77 Mon Sep 17 00:00:00 2001 +From b88c7edf3af4bcce30821a6763f1ed771efb1833 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support diff --git a/Bukkit-Patches/0006-Add-Arrow-API.patch b/Bukkit-Patches/0006-Add-Arrow-API.patch index 2048fd37..0b0857bb 100644 --- a/Bukkit-Patches/0006-Add-Arrow-API.patch +++ b/Bukkit-Patches/0006-Add-Arrow-API.patch @@ -1,4 +1,4 @@ -From 6c70b68ac4ecd10c857c8b4cf463df39f68b726f Mon Sep 17 00:00:00 2001 +From 8c8c755384aaff1a380ee2665042164f018b60c2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:08:24 +1000 Subject: [PATCH] Add Arrow API diff --git a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch index d7e077dd..b989fbd3 100644 --- a/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch +++ b/Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From fb339f3f7e453f6fcb5e603051e0bc3df9da6939 Mon Sep 17 00:00:00 2001 +From 2df28f4bb265e90c9b4b635dbbcd67bfded5900b Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:01 -0500 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent diff --git a/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch b/Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch index 19fab4d0..14f05f3e 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 b68add7dc4b2fc0573c1e218532c87ce30fbb274 Mon Sep 17 00:00:00 2001 +From 2da0d0f020bf7354b1c2922b7f9872d9d7b86042 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:53 +1000 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch index 68543302..4c73f2e1 100644 --- a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch +++ b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch @@ -1,4 +1,4 @@ -From be46952b670349d1065cdbd8511c2197c4e2cb3d Mon Sep 17 00:00:00 2001 +From 737ac37f20bff38188574d050a5786ec9ad74df2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 7 Jul 2013 10:32:05 -0400 Subject: [PATCH] InventoryClickEvent getClickedInventory diff --git a/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch b/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch index f1a54dd6..5ab01ea6 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 a4ba3e6c23a818b6e252cfe2c26352182e3c48a1 Mon Sep 17 00:00:00 2001 +From d047f9fdf031167c81048b0aeeec3254d3c587b1 Mon Sep 17 00:00:00 2001 From: Alex Bennett Date: Thu, 11 Jul 2013 15:31:32 -0500 Subject: [PATCH] Added getAllSessionData() to the Conversation API. diff --git a/Bukkit-Patches/0011-Player-Collision-API.patch b/Bukkit-Patches/0011-Player-Collision-API.patch index 0d6106f5..d0b6d9ac 100644 --- a/Bukkit-Patches/0011-Player-Collision-API.patch +++ b/Bukkit-Patches/0011-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 82903197c713eb5cd64121289c650c29d1d8fbd0 Mon Sep 17 00:00:00 2001 +From 7c31ac3a9c7e22b62640ba98f350192b8a546ad1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:20:50 +1000 Subject: [PATCH] Player Collision API diff --git a/Bukkit-Patches/0012-Expand-Boolean-Prompt-Values.patch b/Bukkit-Patches/0012-Expand-Boolean-Prompt-Values.patch index a0a79dfd..fefa56b0 100644 --- a/Bukkit-Patches/0012-Expand-Boolean-Prompt-Values.patch +++ b/Bukkit-Patches/0012-Expand-Boolean-Prompt-Values.patch @@ -1,4 +1,4 @@ -From 1a52e9cc4c86c72ebab80030693ae284d4726f58 Mon Sep 17 00:00:00 2001 +From 9f856422064c856d6e5c17d639003829bbb75930 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:42:16 +1000 Subject: [PATCH] Expand Boolean Prompt Values diff --git a/Bukkit-Patches/0013-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0013-Add-Getter-for-Entity-Invulnerability.patch index 1d1a55b5..860529aa 100644 --- a/Bukkit-Patches/0013-Add-Getter-for-Entity-Invulnerability.patch +++ b/Bukkit-Patches/0013-Add-Getter-for-Entity-Invulnerability.patch @@ -1,4 +1,4 @@ -From 58f5460ca00631a393f39b47f02266d345af4c5e Mon Sep 17 00:00:00 2001 +From bb37e5575e08877517d2b3dd4ed395f3de38c709 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:49:36 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/Bukkit-Patches/0014-Add-respawn-API.patch b/Bukkit-Patches/0014-Add-respawn-API.patch index 635244f5..02d48a12 100644 --- a/Bukkit-Patches/0014-Add-respawn-API.patch +++ b/Bukkit-Patches/0014-Add-respawn-API.patch @@ -1,4 +1,4 @@ -From b0d88ff023cc694ad33c2e4461992f8ca34d8cf7 Mon Sep 17 00:00:00 2001 +From 73ed6eb53fb3a831df4adef1eb449397c470637b Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:35:58 +0200 Subject: [PATCH] Add respawn API. diff --git a/Bukkit-Patches/0015-Implement-Locale-Getter-for-Players.patch b/Bukkit-Patches/0015-Implement-Locale-Getter-for-Players.patch index 87405c4a..2e9f8163 100644 --- a/Bukkit-Patches/0015-Implement-Locale-Getter-for-Players.patch +++ b/Bukkit-Patches/0015-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 9ef8cacfe15c2fc4c047c99fe94c6e70bb8f7e4d Mon Sep 17 00:00:00 2001 +From fae06377bcd68e5cb900329f03e946a7b2b0fed5 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:10:49 +1100 Subject: [PATCH] Implement Locale Getter for Players diff --git a/Bukkit-Patches/0016-Add-support-for-fetching-hidden-players.patch b/Bukkit-Patches/0016-Add-support-for-fetching-hidden-players.patch index 0b6fff8e..a74af855 100644 --- a/Bukkit-Patches/0016-Add-support-for-fetching-hidden-players.patch +++ b/Bukkit-Patches/0016-Add-support-for-fetching-hidden-players.patch @@ -1,4 +1,4 @@ -From 3c2b4abb1c8df72e3a6e88cf40d70d9dcf8d5a8a Mon Sep 17 00:00:00 2001 +From c891bc28532673a8e94ad24630b99f13df21583c Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:02:11 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/Bukkit-Patches/0017-Silenceable-Lightning-API.patch b/Bukkit-Patches/0017-Silenceable-Lightning-API.patch index 18a7867c..d2b36d83 100644 --- a/Bukkit-Patches/0017-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0017-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 048c7c79c747fb83d25b376419eb55644dd14dcd Mon Sep 17 00:00:00 2001 +From f55070b493b564582e5db9553d2f414e76b1c966 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:29 -0400 Subject: [PATCH] Silenceable Lightning API diff --git a/Bukkit-Patches/0018-Remove-deprecation-on-some-player-lookup-methods.patch b/Bukkit-Patches/0018-Remove-deprecation-on-some-player-lookup-methods.patch index 8f765ee6..14a55825 100644 --- a/Bukkit-Patches/0018-Remove-deprecation-on-some-player-lookup-methods.patch +++ b/Bukkit-Patches/0018-Remove-deprecation-on-some-player-lookup-methods.patch @@ -1,4 +1,4 @@ -From a709434e09d8f08e0659739802f1ab121b0ef7d8 Mon Sep 17 00:00:00 2001 +From fccedcbe94f842d76facf034cd5eee98a3adaa40 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 @@ -49,7 +49,7 @@ index 27c69e96..0f42a66a 100644 return server.matchPlayer(name); } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c9ef86e4..65ad9aa0 100644 +index 39b4b27c..65641699 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -303,23 +303,17 @@ public interface Server extends PluginMessageRecipient { diff --git a/Bukkit-Patches/0019-Add-PlayerSpawnLocationEvent.patch b/Bukkit-Patches/0019-Add-PlayerSpawnLocationEvent.patch index 7ecd457b..77dc596b 100644 --- a/Bukkit-Patches/0019-Add-PlayerSpawnLocationEvent.patch +++ b/Bukkit-Patches/0019-Add-PlayerSpawnLocationEvent.patch @@ -1,4 +1,4 @@ -From d139d10e754a896afc297fce192f4b7c893f99da Mon Sep 17 00:00:00 2001 +From 0b274b75697ee668953cef8fc33a76f36b9a53a0 Mon Sep 17 00:00:00 2001 From: ninja Date: Tue, 8 Apr 2014 14:01:32 +0200 Subject: [PATCH] Add PlayerSpawnLocationEvent. diff --git a/Bukkit-Patches/0020-Ease-ClassLoader-Deadlocks-Where-Possible.patch b/Bukkit-Patches/0020-Ease-ClassLoader-Deadlocks-Where-Possible.patch index 0593cbd2..645efe0f 100644 --- a/Bukkit-Patches/0020-Ease-ClassLoader-Deadlocks-Where-Possible.patch +++ b/Bukkit-Patches/0020-Ease-ClassLoader-Deadlocks-Where-Possible.patch @@ -1,4 +1,4 @@ -From c69b90a15fa7fd7e87fb00fbc8b935b3c3988e8a Mon Sep 17 00:00:00 2001 +From 8181e3ca8c1a5f47cac15d6bc389d065f2ae9f2b Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Jul 2014 17:24:21 +1000 Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible diff --git a/Bukkit-Patches/0021-Undeprecate-Player-updateInventory-V.patch b/Bukkit-Patches/0021-Undeprecate-Player-updateInventory-V.patch index 1db11e3c..d1c49554 100644 --- a/Bukkit-Patches/0021-Undeprecate-Player-updateInventory-V.patch +++ b/Bukkit-Patches/0021-Undeprecate-Player-updateInventory-V.patch @@ -1,4 +1,4 @@ -From f9cf986ee1bdf5c7966e683f9922e2c0fcaf4e15 Mon Sep 17 00:00:00 2001 +From 697fa066c39fb97accb325dd610afeb0d49be801 Mon Sep 17 00:00:00 2001 From: drXor Date: Wed, 23 Jul 2014 15:50:36 -0400 Subject: [PATCH] Undeprecate Player#updateInventory()V diff --git a/Bukkit-Patches/0022-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/Bukkit-Patches/0022-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index e6c58e63..e5d79647 100644 --- a/Bukkit-Patches/0022-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/Bukkit-Patches/0022-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 9ba610535045a7ff29815a1c73a977f6ee7eecbc Mon Sep 17 00:00:00 2001 +From 9413847d3f13aff8cf8b607ca85a2eb280ab744d Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:31:04 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/Bukkit-Patches/0023-BungeeCord-Chat-API.patch b/Bukkit-Patches/0023-BungeeCord-Chat-API.patch index ae7f3505..f8ad7a12 100644 --- a/Bukkit-Patches/0023-BungeeCord-Chat-API.patch +++ b/Bukkit-Patches/0023-BungeeCord-Chat-API.patch @@ -1,11 +1,11 @@ -From 3b24fd601a982cf6893f914495dbce6a681dcb3f Mon Sep 17 00:00:00 2001 +From fe876d095a9b60c1ffb8867ebe461ce634762c9d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 02:59:14 +0100 Subject: [PATCH] BungeeCord Chat API diff --git a/pom.xml b/pom.xml -index a53bb3dd..3e6c8707 100644 +index 75469885..e946bccf 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,14 @@ diff --git a/Bukkit-Patches/0024-Add-restart-API.patch b/Bukkit-Patches/0024-Add-restart-API.patch index 207c7ab8..460a9f10 100644 --- a/Bukkit-Patches/0024-Add-restart-API.patch +++ b/Bukkit-Patches/0024-Add-restart-API.patch @@ -1,4 +1,4 @@ -From 0df7847f370c251493a65723dc66814079ecbd4a Mon Sep 17 00:00:00 2001 +From 7b0e76dfaeb3471c2d8523a57488a6664e5befd5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 13 Jul 2015 19:10:15 +1000 Subject: [PATCH] Add restart API. diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index b85e794c..77b9f019 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 3ae76c21e04e28cfe373f1c03772e22091a814fb Mon Sep 17 00:00:00 2001 +From a8726a247a29a1435c3206f7918c070b1b4ac62d 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 9d8810cc..958eb763 100644 +index 932d51b7b..5d398f7cb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -18,7 +18,7 @@ index 9d8810cc..958eb763 100644 + org.spigotmc + spigot jar - 1.13-pre7-R0.1-SNAPSHOT + 1.13-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot @@ -99,7 +99,7 @@ index 9d8810cc..958eb763 100644 Bukkit ${api.version} diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index f905d17b..93046379 100644 +index f905d17b6..93046379d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index bb678069..2e3b1a61 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 7a855fa4c10eadd25a2e98cd507d7cd9f0afdbdd Mon Sep 17 00:00:00 2001 +From c6ee921767b320a3e46279bb4c5118f257371904 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index df6d227fe..687c29bf7 100644 +index c5e1c0374..73e4cb4aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1784,4 +1784,14 @@ public final class CraftServer implements Server { +@@ -1766,4 +1766,14 @@ public final class CraftServer implements Server { public UnsafeValues getUnsafe() { return CraftMagicNumbers.INSTANCE; } diff --git a/CraftBukkit-Patches/0003-mc-dev-imports.patch b/CraftBukkit-Patches/0003-mc-dev-imports.patch index d7b1176e..b4e0a38c 100644 --- a/CraftBukkit-Patches/0003-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0003-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From 9d7dfd74029263cde1add98520ba205fbd88aba5 Mon Sep 17 00:00:00 2001 +From 94b4959e5bb71cb3161a6e2b01230cf3bc24bbeb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 15:10:48 +1100 Subject: [PATCH] mc-dev imports @@ -7,7 +7,7 @@ Imported files which are only modified by Spigot, not upstream. Files here shoul diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java new file mode 100644 -index 00000000..47279ebf +index 000000000..47279ebfd --- /dev/null +++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java @@ -0,0 +1,117 @@ @@ -130,7 +130,7 @@ index 00000000..47279ebf +} diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java new file mode 100644 -index 00000000..957af9b3 +index 000000000..957af9b3f --- /dev/null +++ b/src/main/java/net/minecraft/server/ChunkGenerator.java @@ -0,0 +1,43 @@ @@ -179,7 +179,7 @@ index 00000000..957af9b3 +} diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java new file mode 100644 -index 00000000..a0362c3f +index 000000000..a0362c3f8 --- /dev/null +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -0,0 +1,159 @@ @@ -344,7 +344,7 @@ index 00000000..a0362c3f +} diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java new file mode 100644 -index 00000000..34a3633a +index 000000000..764dec080 --- /dev/null +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -0,0 +1,271 @@ @@ -398,11 +398,11 @@ index 00000000..34a3633a + return SoundEffects.ENTITY_SQUID_HURT; + } + -+ protected SoundEffect cr() { ++ protected SoundEffect cs() { + return SoundEffects.ENTITY_SQUID_DEATH; + } + -+ protected float cC() { ++ protected float cD() { + return 0.4F; + } + @@ -485,7 +485,7 @@ index 00000000..34a3633a + + public boolean damageEntity(DamageSource damagesource, float f) { + if (super.damageEntity(damagesource, f) && this.getLastDamager() != null) { -+ this.dy(); ++ this.dz(); + return true; + } else { + return false; @@ -499,8 +499,8 @@ index 00000000..34a3633a + return vec3d1; + } + -+ private void dy() { -+ this.a(SoundEffects.ENTITY_SQUID_SQUIRT, this.cC(), this.cD()); ++ private void dz() { ++ this.a(SoundEffects.ENTITY_SQUID_SQUIRT, this.cD(), this.cE()); + Vec3D vec3d = this.b(new Vec3D(0.0D, -1.0D, 0.0D)).add(this.locX, this.locY, this.locZ); + + for (int i = 0; i < 30; ++i) { @@ -603,7 +603,7 @@ index 00000000..34a3633a + } + + public void e() { -+ int i = this.b.ci(); ++ int i = this.b.cj(); + + if (i > 100) { + this.b.c(0.0F, 0.0F, 0.0F); @@ -621,7 +621,7 @@ index 00000000..34a3633a +} diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java new file mode 100644 -index 00000000..634d4f72 +index 000000000..634d4f721 --- /dev/null +++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java @@ -0,0 +1,55 @@ @@ -682,7 +682,7 @@ index 00000000..634d4f72 +} diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java new file mode 100644 -index 00000000..1a7e20d6 +index 000000000..1a7e20d6f --- /dev/null +++ b/src/main/java/net/minecraft/server/GenericAttributes.java @@ -0,0 +1,120 @@ @@ -808,7 +808,7 @@ index 00000000..1a7e20d6 +} diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java new file mode 100644 -index 00000000..f761bb90 +index 000000000..f761bb90f --- /dev/null +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -0,0 +1,24 @@ @@ -838,7 +838,7 @@ index 00000000..f761bb90 +} diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java new file mode 100644 -index 00000000..345d763d +index 000000000..345d763d9 --- /dev/null +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java @@ -0,0 +1,89 @@ @@ -933,7 +933,7 @@ index 00000000..345d763d +} diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java new file mode 100644 -index 00000000..6f8d3748 +index 000000000..6f8d3748b --- /dev/null +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java @@ -0,0 +1,123 @@ @@ -1062,7 +1062,7 @@ index 00000000..6f8d3748 +} diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java new file mode 100644 -index 00000000..1022c00b +index 000000000..1022c00be --- /dev/null +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java @@ -0,0 +1,137 @@ @@ -1205,7 +1205,7 @@ index 00000000..1022c00b +} diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java new file mode 100644 -index 00000000..1509c772 +index 000000000..1509c772e --- /dev/null +++ b/src/main/java/net/minecraft/server/NibbleArray.java @@ -0,0 +1,58 @@ @@ -1269,7 +1269,7 @@ index 00000000..1509c772 +} diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java new file mode 100644 -index 00000000..47b871df +index 000000000..47b871dfc --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java @@ -0,0 +1,39 @@ @@ -1314,7 +1314,7 @@ index 00000000..47b871df +} diff --git a/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java new file mode 100644 -index 00000000..bc93677f +index 000000000..bc93677fa --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayInArmAnimation.java @@ -0,0 +1,30 @@ @@ -1350,7 +1350,7 @@ index 00000000..bc93677f +} diff --git a/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java new file mode 100644 -index 00000000..06f3954b +index 000000000..06f3954b0 --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java @@ -0,0 +1,30 @@ @@ -1386,7 +1386,7 @@ index 00000000..06f3954b +} diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java new file mode 100644 -index 00000000..cfea4d54 +index 000000000..cfea4d549 --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java @@ -0,0 +1,34 @@ @@ -1426,7 +1426,7 @@ index 00000000..cfea4d54 +} diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java new file mode 100644 -index 00000000..3c5f8151 +index 000000000..3c5f81519 --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java @@ -0,0 +1,61 @@ @@ -1493,7 +1493,7 @@ index 00000000..3c5f8151 +} diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java new file mode 100644 -index 00000000..e55384e7 +index 000000000..e55384e70 --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -0,0 +1,46 @@ @@ -1545,7 +1545,7 @@ index 00000000..e55384e7 +} diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java new file mode 100644 -index 00000000..54550602 +index 000000000..855192af3 --- /dev/null +++ b/src/main/java/net/minecraft/server/PersistentCollection.java @@ -0,0 +1,201 @@ @@ -1599,7 +1599,7 @@ index 00000000..54550602 + + if (file != null && file.exists()) { + persistentbase = (PersistentBase) function.apply(s); -+ persistentbase.a(this.a(s, 1513).getCompound("data")); ++ persistentbase.a(this.a(s, 1519).getCompound("data")); + this.a.put(s, persistentbase); + this.d.add(persistentbase); + } @@ -1674,7 +1674,7 @@ index 00000000..54550602 + NBTTagCompound nbttagcompound = new NBTTagCompound(); + + nbttagcompound.set("data", persistentbase.b(new NBTTagCompound())); -+ nbttagcompound.setInt("DataVersion", 1513); ++ nbttagcompound.setInt("DataVersion", 1519); + FileOutputStream fileoutputstream = new FileOutputStream(file); + + NBTCompressedStreamTools.a(nbttagcompound, (OutputStream) fileoutputstream); @@ -1752,7 +1752,7 @@ index 00000000..54550602 +} diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java new file mode 100644 -index 00000000..d62670ac +index 000000000..d62670ac5 --- /dev/null +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -0,0 +1,144 @@ @@ -1902,7 +1902,7 @@ index 00000000..d62670ac +} diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java new file mode 100644 -index 00000000..3215f9dd +index 000000000..38ff3b662 --- /dev/null +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java @@ -0,0 +1,229 @@ @@ -2105,7 +2105,7 @@ index 00000000..3215f9dd + JsonObject jsonobject1 = new JsonObject(); + + jsonobject1.add("stats", jsonobject); -+ jsonobject1.addProperty("DataVersion", Integer.valueOf(1513)); ++ jsonobject1.addProperty("DataVersion", Integer.valueOf(1519)); + return jsonobject1.toString(); + } + @@ -2137,7 +2137,7 @@ index 00000000..3215f9dd +} diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java new file mode 100644 -index 00000000..263ea953 +index 000000000..263ea953a --- /dev/null +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -0,0 +1,240 @@ @@ -2383,7 +2383,7 @@ index 00000000..263ea953 +} diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java new file mode 100644 -index 00000000..fb5ac05d +index 000000000..fb5ac05d5 --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java @@ -0,0 +1,37 @@ @@ -2426,7 +2426,7 @@ index 00000000..fb5ac05d +} diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java new file mode 100644 -index 00000000..e6cc8f01 +index 000000000..e6cc8f011 --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java @@ -0,0 +1,42 @@ @@ -2474,7 +2474,7 @@ index 00000000..e6cc8f01 +} diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java new file mode 100644 -index 00000000..9d564488 +index 000000000..9d564488e --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java @@ -0,0 +1,37 @@ @@ -2517,7 +2517,7 @@ index 00000000..9d564488 +} diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java new file mode 100644 -index 00000000..3d8e08ff +index 000000000..3d8e08ff5 --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java @@ -0,0 +1,59 @@ @@ -2582,7 +2582,7 @@ index 00000000..3d8e08ff +} diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java new file mode 100644 -index 00000000..6acbccb0 +index 000000000..6acbccb0f --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java @@ -0,0 +1,56 @@ @@ -2644,7 +2644,7 @@ index 00000000..6acbccb0 +} diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java new file mode 100644 -index 00000000..a50a45c4 +index 000000000..a50a45c43 --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java @@ -0,0 +1,47 @@ @@ -2697,7 +2697,7 @@ index 00000000..a50a45c4 +} diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java new file mode 100644 -index 00000000..887293c3 +index 000000000..887293c3c --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java @@ -0,0 +1,58 @@ @@ -2761,7 +2761,7 @@ index 00000000..887293c3 +} diff --git a/src/main/java/net/minecraft/server/WorldGenMonument.java b/src/main/java/net/minecraft/server/WorldGenMonument.java new file mode 100644 -index 00000000..57afb480 +index 000000000..57afb4809 --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenMonument.java @@ -0,0 +1,159 @@ @@ -2926,7 +2926,7 @@ index 00000000..57afb480 +} diff --git a/src/main/java/net/minecraft/server/WorldGenVillage.java b/src/main/java/net/minecraft/server/WorldGenVillage.java new file mode 100644 -index 00000000..c9ac6ca8 +index 000000000..c9ac6ca80 --- /dev/null +++ b/src/main/java/net/minecraft/server/WorldGenVillage.java @@ -0,0 +1,121 @@ @@ -3053,7 +3053,7 @@ index 00000000..c9ac6ca8 +} diff --git a/src/main/java/org/spigotmc/SneakyThrow.java b/src/main/java/org/spigotmc/SneakyThrow.java new file mode 100644 -index 00000000..31fc0a98 +index 000000000..31fc0a984 --- /dev/null +++ b/src/main/java/org/spigotmc/SneakyThrow.java @@ -0,0 +1,15 @@ diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch index 89609d38..ea0ef875 100644 --- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From ea038be68c052b9d412b0ddbbeae9fae56918047 Mon Sep 17 00:00:00 2001 +From 7f5e1cdcbdba8f6877b3edbb1e3276802167cae9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -6,7 +6,7 @@ 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 b6a35ade..fe05229e 100644 +index 2d6154bd3..b8a4b0bdd 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -177,6 +177,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -31,7 +31,7 @@ index b6a35ade..fe05229e 100644 server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9a8071ac..5b5369da 100644 +index 000992db7..28cb33095 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -99,6 +99,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -51,7 +51,7 @@ index 9a8071ac..5b5369da 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 687c29bf..ea56af0f 100644 +index 73e4cb4aa..6804b84fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -722,6 +722,7 @@ public final class CraftServer implements Server { @@ -78,10 +78,10 @@ index 687c29bf..ea56af0f 100644 ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index e8bf55e8..c234b874 100644 +index 3fecc796f..df07dc594 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -118,6 +118,14 @@ public class Main { +@@ -120,6 +120,14 @@ public class Main { acceptsAll(asList("v", "version"), "Show the CraftBukkit Version"); acceptsAll(asList("demo"), "Demo mode"); @@ -98,7 +98,7 @@ index e8bf55e8..c234b874 100644 diff --git a/src/main/java/org/spigotmc/SpigotCommand.java b/src/main/java/org/spigotmc/SpigotCommand.java new file mode 100644 -index 00000000..fdb030c7 +index 000000000..fdb030c7a --- /dev/null +++ b/src/main/java/org/spigotmc/SpigotCommand.java @@ -0,0 +1,44 @@ @@ -148,7 +148,7 @@ index 00000000..fdb030c7 +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java new file mode 100644 -index 00000000..132ab78c +index 000000000..132ab78ce --- /dev/null +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -0,0 +1,140 @@ @@ -294,7 +294,7 @@ index 00000000..132ab78c +} diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java new file mode 100644 -index 00000000..961ddb42 +index 000000000..961ddb428 --- /dev/null +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -0,0 +1,71 @@ diff --git a/CraftBukkit-Patches/0005-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0005-Crop-Growth-Rates.patch index d8442c93..65e365b2 100644 --- a/CraftBukkit-Patches/0005-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0005-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From c8e51c1faab2e588b7c693c9ab9b482421230d79 Mon Sep 17 00:00:00 2001 +From 4d520f0825124b2dee507cd30b6eddcd4bae0984 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 7 Mar 2016 22:14:13 +1100 Subject: [PATCH] Crop Growth Rates @@ -6,10 +6,10 @@ Subject: [PATCH] Crop Growth Rates Allows configuring the growth rates of crops as a percentage of their normal growth rate. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index bafd8432..139b40f1 100644 +index cc272c68d..95d6174e8 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java -@@ -1401,6 +1401,18 @@ public class Block implements IMaterial { +@@ -1427,6 +1427,18 @@ public class Block implements IMaterial { a(new MinecraftKey(s), block); } @@ -29,7 +29,7 @@ index bafd8432..139b40f1 100644 NONE, XZ, XYZ; diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index f5cef227..54685157 100644 +index f5cef2276..54685157f 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -32,7 +32,7 @@ public class BlockCactus extends Block { @@ -42,7 +42,7 @@ index f5cef227..54685157 100644 IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, Integer.valueOf(0)); diff --git a/src/main/java/net/minecraft/server/BlockCocoa.java b/src/main/java/net/minecraft/server/BlockCocoa.java -index b4ba8b56..e2c8b90b 100644 +index 95303b97f..a343d8acb 100644 --- a/src/main/java/net/minecraft/server/BlockCocoa.java +++ b/src/main/java/net/minecraft/server/BlockCocoa.java @@ -19,7 +19,7 @@ public class BlockCocoa extends BlockFacingHorizontal implements IBlockFragilePl @@ -55,11 +55,11 @@ index b4ba8b56..e2c8b90b 100644 if (i < 2) { diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java -index 11136873..e64b6dbd 100644 +index faa5a5190..b392846aa 100644 --- a/src/main/java/net/minecraft/server/BlockCrops.java +++ b/src/main/java/net/minecraft/server/BlockCrops.java @@ -50,7 +50,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement - if (i < this.d()) { + if (i < this.e()) { float f = a((Block) this, (IBlockAccess) world, blockposition); - if (random.nextInt((int) (25.0F / f) + 1) == 0) { @@ -68,7 +68,7 @@ index 11136873..e64b6dbd 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java -index 0dd2122d..cc063ad3 100644 +index ea2d9f4d0..56d290caa 100644 --- a/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/src/main/java/net/minecraft/server/BlockMushroom.java @@ -21,7 +21,7 @@ public class BlockMushroom extends BlockPlant implements IBlockFragilePlantEleme @@ -81,7 +81,7 @@ index 0dd2122d..cc063ad3 100644 boolean flag = true; Iterator iterator = BlockPosition.b(blockposition.a(-4, -1, -4), blockposition.a(4, 1, 4)).iterator(); diff --git a/src/main/java/net/minecraft/server/BlockNetherWart.java b/src/main/java/net/minecraft/server/BlockNetherWart.java -index 46092357..f3f47a81 100644 +index 460923578..f3f47a81c 100644 --- a/src/main/java/net/minecraft/server/BlockNetherWart.java +++ b/src/main/java/net/minecraft/server/BlockNetherWart.java @@ -23,7 +23,7 @@ public class BlockNetherWart extends BlockPlant { @@ -94,7 +94,7 @@ index 46092357..f3f47a81 100644 org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, blockposition, iblockdata, 2); // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 6fcd81ce..313821d5 100644 +index 6fcd81ce5..313821d52 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -28,7 +28,7 @@ public class BlockReed extends Block { @@ -107,7 +107,7 @@ index 6fcd81ce..313821d5 100644 world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4); } else { diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java -index 8b2e5f57..723e5c9b 100644 +index 8b2e5f577..723e5c9b4 100644 --- a/src/main/java/net/minecraft/server/BlockSapling.java +++ b/src/main/java/net/minecraft/server/BlockSapling.java @@ -30,7 +30,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen @@ -120,7 +120,7 @@ index 8b2e5f57..723e5c9b 100644 world.captureTreeGeneration = true; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java -index 61b44b50..3959e070 100644 +index fd7ecbbd7..0192f9386 100644 --- a/src/main/java/net/minecraft/server/BlockStem.java +++ b/src/main/java/net/minecraft/server/BlockStem.java @@ -30,7 +30,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement { @@ -133,7 +133,7 @@ index 61b44b50..3959e070 100644 if (i < 7) { diff --git a/src/main/java/net/minecraft/server/BlockVine.java b/src/main/java/net/minecraft/server/BlockVine.java -index 58b20b7e..704acd9f 100644 +index e63b1356a..daf5d8d7a 100644 --- a/src/main/java/net/minecraft/server/BlockVine.java +++ b/src/main/java/net/minecraft/server/BlockVine.java @@ -166,7 +166,7 @@ public class BlockVine extends Block { @@ -146,7 +146,7 @@ index 58b20b7e..704acd9f 100644 BlockPosition blockposition1 = blockposition.up(); BlockPosition blockposition2; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 961ddb42..c62fa456 100644 +index 961ddb428..c62fa4569 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -68,4 +68,41 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch index 0eb55773..b6ced0f9 100644 --- a/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From b3c2aecb3b28a8ea87c344983626a97312d7d0a9 Mon Sep 17 00:00:00 2001 +From 7258a9a81704a9011d3598d084bcf94eb0a932db 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players. diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 13a0ed12..9a20b640 100644 +index 13a0ed127..9a20b640d 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -149,7 +149,10 @@ public class EntityItem extends Entity { @@ -43,7 +43,7 @@ index 13a0ed12..9a20b640 100644 } } else { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5b5369da..539e5a5f 100644 +index 28cb33095..457e868d8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -864,6 +864,23 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -71,7 +71,7 @@ index 5b5369da..539e5a5f 100644 if (event != null && (event.isCancelled() || entity.dead)) { entity.dead = true; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index c62fa456..23730154 100644 +index c62fa4569..23730154d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -105,4 +105,18 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch b/CraftBukkit-Patches/0007-Async-Operation-Catching.patch index 7eb70aa5..0d0da4ed 100644 --- a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0007-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From ab5a0b76a92bc8f5e8c053bdead5a8a43c92cc44 Mon Sep 17 00:00:00 2001 +From ad3abfbdc0f3615e7b996d95ac7963f2fcdc460b Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -6,10 +6,10 @@ Subject: [PATCH] Async Operation Catching Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 139b40f17..ffb91b27b 100644 +index 95d6174e8..06f10e1e8 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java -@@ -396,10 +396,14 @@ public class Block implements IMaterial { +@@ -395,10 +395,14 @@ public class Block implements IMaterial { } @Deprecated @@ -27,7 +27,7 @@ index 139b40f17..ffb91b27b 100644 public int a(IBlockData iblockdata, Random random) { return 1; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dc0bc803c..6fa6900a0 100644 +index 549fa2105..caccb1a15 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -725,6 +725,7 @@ public abstract class EntityLiving extends Entity { @@ -59,7 +59,7 @@ index 14fab2b31..ef5817933 100644 EntityPlayer entityplayer = (EntityPlayer) entity; Iterator iterator = this.c.iterator(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 3cd0b0a9f..0410f9cf3 100644 +index 0a59da7d5..6e940b640 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -324,6 +324,7 @@ public class EntityTrackerEntry { @@ -79,7 +79,7 @@ index 3cd0b0a9f..0410f9cf3 100644 this.trackedPlayers.remove(entityplayer); this.tracker.c(entityplayer); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 539e5a5fe..b88c35c8e 100644 +index 457e868d8..882fa397f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -840,6 +840,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -106,7 +106,7 @@ index 539e5a5fe..b88c35c8e 100644 entity.b(false); entity.die(); if (entity instanceof EntityHuman) { -@@ -2153,6 +2156,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose +@@ -2157,6 +2160,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose } public void a(Collection collection) { @@ -115,7 +115,7 @@ index 539e5a5fe..b88c35c8e 100644 // this.entityList.addAll(collection); Iterator iterator = collection.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ea56af0f4..b8705cc7b 100644 +index 6804b84fa..099bc9e34 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -668,6 +668,7 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0008-View-Distance.patch b/CraftBukkit-Patches/0008-View-Distance.patch index bc038673..a0d7c2a3 100644 --- a/CraftBukkit-Patches/0008-View-Distance.patch +++ b/CraftBukkit-Patches/0008-View-Distance.patch @@ -1,4 +1,4 @@ -From abe92e401dcc40f0d3385068e234cc54638eb8a0 Mon Sep 17 00:00:00 2001 +From 70e6582e1ad41d97b0a96d515d770cbd2bb46542 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -6,7 +6,7 @@ Subject: [PATCH] View Distance This commit allows the user to select per world view distances, and view distances below 3. Be wary of the issues selecting a view distance of 1 or 2 may cause! diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index ef581793..4ecdeef2 100644 +index ef5817933..4ecdeef23 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -18,7 +18,7 @@ public class EntityTracker { @@ -19,7 +19,7 @@ index ef581793..4ecdeef2 100644 public static long a(double d0) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 551236c9..d7c299a4 100644 +index 551236c95..d7c299a41 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -42,7 +42,7 @@ public class PlayerChunkMap { @@ -32,7 +32,7 @@ index 551236c9..d7c299a4 100644 public WorldServer getWorld() { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 23730154..f5096e3a 100644 +index 23730154d..f5096e3a4 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -119,4 +119,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0009-Spigot-Timings.patch b/CraftBukkit-Patches/0009-Spigot-Timings.patch index 351f241b..e4c20661 100644 --- a/CraftBukkit-Patches/0009-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0009-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From cb66502df093503f966530e88032675ff725026f Mon Sep 17 00:00:00 2001 +From 638ccd1e6396da6b58cc60744a760a1711417f8e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -24,7 +24,7 @@ index 684fa0753..3e719d5cd 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 63a1823ac..d95c87fd7 100644 +index 0989ebd88..6a99c9928 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -120,7 +120,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -37,7 +37,7 @@ index 63a1823ac..d95c87fd7 100644 if (data != null) { Chunk chunk = (Chunk) data[0]; NBTTagCompound nbttagcompound = (NBTTagCompound) data[1]; -@@ -651,6 +653,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -653,6 +655,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { public void loadEntities(NBTTagCompound nbttagcompound, Chunk chunk) { NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10); World world = chunk.getWorld(); @@ -45,7 +45,7 @@ index 63a1823ac..d95c87fd7 100644 for (int i = 0; i < nbttaglist.size(); ++i) { NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i); -@@ -659,6 +662,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -661,6 +664,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { chunk.f(true); } @@ -54,7 +54,7 @@ index 63a1823ac..d95c87fd7 100644 NBTTagList nbttaglist1 = nbttagcompound.getList("TileEntities", 10); for (int j = 0; j < nbttaglist1.size(); ++j) { -@@ -675,6 +680,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -677,6 +682,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } } } @@ -63,7 +63,7 @@ index 63a1823ac..d95c87fd7 100644 if (nbttagcompound.hasKeyOfType("TileTicks", 9) && world.I() instanceof TickListServer) { ((TickListServer) world.I()).a(nbttagcompound.getList("TileTicks", 10)); -@@ -683,6 +690,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -685,6 +692,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { if (nbttagcompound.hasKeyOfType("LiquidTicks", 9) && world.H() instanceof TickListServer) { ((TickListServer) world.H()).a(nbttagcompound.getList("LiquidTicks", 10)); } @@ -72,7 +72,7 @@ index 63a1823ac..d95c87fd7 100644 } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index fe05229e1..427668ec1 100644 +index b8a4b0bdd..dbd74d384 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -29,6 +29,7 @@ import org.apache.logging.log4j.Level; @@ -100,7 +100,7 @@ index fe05229e1..427668ec1 100644 public boolean S() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2a84d5de4..f347d2aa7 100644 +index 015c6ab69..e7f989686 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -29,6 +29,7 @@ import org.bukkit.command.CommandSender; @@ -136,7 +136,7 @@ index 2a84d5de4..f347d2aa7 100644 protected float ab() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6fa6900a0..7d688f287 100644 +index caccb1a15..6f8572573 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -32,6 +32,8 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -154,7 +154,7 @@ index 6fa6900a0..7d688f287 100644 public void tick() { + SpigotTimings.timerEntityBaseTick.startTiming(); // Spigot super.tick(); - this.cU(); + this.cV(); this.o(); @@ -2048,7 +2051,9 @@ public abstract class EntityLiving extends Entity { } @@ -205,13 +205,13 @@ index 6fa6900a0..7d688f287 100644 } + SpigotTimings.timerEntityAICollision.startTiming(); // Spigot - this.cM(); + this.cN(); + SpigotTimings.timerEntityAICollision.stopTiming(); // Spigot this.world.methodProfiler.e(); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7dacad688..d000f5bf6 100644 +index 55022c848..de497fa50 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -62,6 +62,7 @@ import org.bukkit.Bukkit; @@ -222,7 +222,7 @@ index 7dacad688..d000f5bf6 100644 public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStatistics, ICommandListener, Runnable { -@@ -729,6 +730,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -768,6 +769,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati public void u() {} protected void v() { @@ -230,7 +230,7 @@ index 7dacad688..d000f5bf6 100644 long i = SystemUtils.c(); ++this.ticks; -@@ -754,10 +756,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -793,10 +795,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit @@ -243,8 +243,8 @@ index 7dacad688..d000f5bf6 100644 } this.methodProfiler.a("snooper"); -@@ -776,10 +780,14 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati - this.ao = this.ao * 0.8F + (float) l / 1000000.0F * 0.19999999F; +@@ -815,10 +819,14 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati + this.ap = this.ap * 0.8F + (float) l / 1000000.0F * 0.19999999F; this.methodProfiler.e(); this.methodProfiler.e(); + SpigotTimings.serverTickTimer.stopTiming(); // Spigot @@ -258,12 +258,12 @@ index 7dacad688..d000f5bf6 100644 this.methodProfiler.a("jobs"); FutureTask futuretask; -@@ -789,17 +797,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -828,17 +836,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } this.methodProfiler.c("commandFunctions"); + SpigotTimings.commandFunctionsTimer.startTiming(); // Spigot - this.aD().X_(); + this.getFunctionData().Y_(); + SpigotTimings.commandFunctionsTimer.stopTiming(); // Spigot this.methodProfiler.c("levels"); @@ -283,7 +283,7 @@ index 7dacad688..d000f5bf6 100644 // Send time updates to everyone, it will get the right time from the world the player is in. if (this.ticks % 20 == 0) { for (int i = 0; i < this.getPlayerList().players.size(); ++i) { -@@ -807,6 +822,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -846,6 +861,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time } } @@ -291,7 +291,7 @@ index 7dacad688..d000f5bf6 100644 int i; -@@ -832,7 +848,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -871,7 +887,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati CrashReport crashreport; try { @@ -301,7 +301,7 @@ index 7dacad688..d000f5bf6 100644 } catch (Throwable throwable) { crashreport = CrashReport.a(throwable, "Exception ticking world"); worldserver.a(crashreport); -@@ -840,7 +858,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -879,7 +897,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } try { @@ -311,7 +311,7 @@ index 7dacad688..d000f5bf6 100644 } catch (Throwable throwable1) { crashreport = CrashReport.a(throwable1, "Exception ticking world entities"); worldserver.a(crashreport); -@@ -849,7 +869,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -888,7 +908,9 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati this.methodProfiler.e(); this.methodProfiler.a("tracker"); @@ -321,7 +321,7 @@ index 7dacad688..d000f5bf6 100644 this.methodProfiler.e(); this.methodProfiler.e(); } -@@ -858,14 +880,20 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -897,14 +919,20 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } this.methodProfiler.c("connection"); @@ -336,14 +336,14 @@ index 7dacad688..d000f5bf6 100644 + SpigotTimings.tickablesTimer.startTiming(); // Spigot for (i = 0; i < this.l.size(); ++i) { - ((ITickable) this.l.get(i)).X_(); + ((ITickable) this.l.get(i)).Y_(); } + SpigotTimings.tickablesTimer.stopTiming(); // Spigot this.methodProfiler.e(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 500ebb245..0d723548a 100644 +index 94a4cc7f1..66420735c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1559,6 +1559,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -372,7 +372,7 @@ index 500ebb245..0d723548a 100644 // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index b121440de..4fec7740b 100644 +index cde437933..331029284 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -4,10 +4,12 @@ import javax.annotation.Nullable; @@ -389,7 +389,7 @@ index b121440de..4fec7740b 100644 private final TileEntityTypes e; protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b88c35c8e..f9d991515 100644 +index 882fa397f..2a13b29f4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -20,6 +20,7 @@ import com.google.common.collect.Maps; @@ -450,7 +450,7 @@ index b88c35c8e..f9d991515 100644 return String.valueOf(TileEntityTypes.a(tileentity.C())); }); + tileentity.tickTimer.startTiming(); // Spigot - ((ITickable) tileentity).X_(); + ((ITickable) tileentity).Y_(); this.methodProfiler.e(); } catch (Throwable throwable2) { @@ -1133,6 +1143,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -490,7 +490,7 @@ index b88c35c8e..f9d991515 100644 entity.N = entity.locX; entity.O = entity.locY; entity.P = entity.locZ; -@@ -1297,6 +1316,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose +@@ -1301,6 +1320,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose } } } @@ -499,7 +499,7 @@ index b88c35c8e..f9d991515 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d1429e418..f2631523a 100644 +index a9a257b95..4d5bede24 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -274,11 +274,14 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -556,10 +556,10 @@ index d1429e418..f2631523a 100644 public boolean j_() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b8705cc7b..259712fcf 100644 +index 099bc9e34..b53223db1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1792,6 +1792,11 @@ public final class CraftServer implements Server { +@@ -1774,6 +1774,11 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch index f002e0e1..a94d6f02 100644 --- a/CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From 145ec3a3f38c8893758b0748f548295dbbe89667 Mon Sep 17 00:00:00 2001 +From 57f02a5f69eb4b3257901cf2b67e1bbcefc3dea6 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 @@ -8,7 +8,7 @@ Changes the mob spawning algorithm to properly account for view distance and the Needs better documentation. diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 27a02c0a..44fb75c6 100644 +index da3229cec..e54dcaa99 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -42,10 +42,15 @@ public final class SpawnerCreature { @@ -32,7 +32,7 @@ index 27a02c0a..44fb75c6 100644 // CraftBukkit start - use LongHash and LongHashSet diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index f5096e3a..3dee3ff5 100644 +index f5096e3a4..3dee3ff5e 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -126,4 +126,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch index 02067405..b98bb27c 100644 --- a/CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch +++ b/CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch @@ -1,11 +1,11 @@ -From 073ba959b655d4de3084e5596ac403342538c2cf Mon Sep 17 00:00:00 2001 +From cedc15f61f7a77c75d8c64c7eec343d8ee2078b1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 Subject: [PATCH] Handle Null Tile Entities diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f9d99151..4c89cb2c 100644 +index 2a13b29f4..7367dac45 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1125,6 +1125,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose diff --git a/CraftBukkit-Patches/0012-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0012-Item-Despawn-Rate.patch index 7bed1761..9a2e7888 100644 --- a/CraftBukkit-Patches/0012-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0012-Item-Despawn-Rate.patch @@ -1,11 +1,11 @@ -From 03cdbd6e71dc6e77e5dcd006b0bdf426e0050650 Mon Sep 17 00:00:00 2001 +From 2ab9f497a835e3c4592e494e4a220bb8976879da 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/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 9a20b640..0ac47b58 100644 +index 9a20b640d..0ac47b585 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -126,7 +126,7 @@ public class EntityItem extends Entity { @@ -26,7 +26,7 @@ index 9a20b640..0ac47b58 100644 } } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 3dee3ff5..6a8b5cd3 100644 +index 3dee3ff5e..6a8b5cd32 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -133,4 +133,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0013-Entity-Activation-Range.patch b/CraftBukkit-Patches/0013-Entity-Activation-Range.patch index f5a866ae..95018806 100644 --- a/CraftBukkit-Patches/0013-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0013-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From a1306e150ab046d5ee45ce927ca127e0c7a48e2f Mon Sep 17 00:00:00 2001 +From 0172a99e6dbe322c05ee0b184e3675f77f3276ce Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f347d2aa7..1d272a6a1 100644 +index e7f989686..855f7ff0a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -159,6 +159,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -98,7 +98,7 @@ index b693c3033..1e5029170 100644 super(entitytypes, world); this.tileX = -1; diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index ff9eee403..4c2cdd4bc 100644 +index da878c760..6e2592e96 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -17,6 +17,14 @@ public class EntityFireworks extends Entity { @@ -150,7 +150,7 @@ index 0ac47b585..4af09f5cd 100644 if (this.motY < 0.05999999865889549D) { this.motY += 5.000000237487257E-4D; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3e762d619..3c1adeea6 100644 +index 6f8572573..514c95151 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -128,6 +128,13 @@ public abstract class EntityLiving extends Entity { @@ -168,7 +168,7 @@ index 3e762d619..3c1adeea6 100644 protected EntityLiving(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 593b55eef..6c66f7deb 100644 +index aacb270fc..32893a32c 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -98,6 +98,22 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -195,7 +195,7 @@ index 593b55eef..6c66f7deb 100644 if (--this.profession <= 0) { BlockPosition blockposition = new BlockPosition(this); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4c89cb2c2..6207a4cd0 100644 +index 7367dac45..ce5fa30b2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1065,6 +1065,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose diff --git a/CraftBukkit-Patches/0014-Metrics.patch b/CraftBukkit-Patches/0014-Metrics.patch index 5885fb73..6640d5dd 100644 --- a/CraftBukkit-Patches/0014-Metrics.patch +++ b/CraftBukkit-Patches/0014-Metrics.patch @@ -1,4 +1,4 @@ -From ff374e0935ac4187ef2294aeeb1584593c3760f2 Mon Sep 17 00:00:00 2001 +From 6242401a1100fd5a8f885a820c9759d399358637 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics @@ -6,7 +6,7 @@ Subject: [PATCH] Metrics diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java new file mode 100644 -index 00000000..a5fd59d5 +index 000000000..e7d5e8ab6 --- /dev/null +++ b/src/main/java/org/spigotmc/Metrics.java @@ -0,0 +1,645 @@ @@ -86,7 +86,7 @@ index 00000000..a5fd59d5 + /** + * The base url of the metrics domain + */ -+ private static final String BASE_URL = "http://mcstats.org"; ++ private static final String BASE_URL = "https://mcstats.spigotmc.org"; + /** + * The url used to report a server's status + */ @@ -656,7 +656,7 @@ index 00000000..a5fd59d5 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 132ab78c..dd02aefc 100644 +index 132ab78ce..dd02aefc7 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -36,6 +36,7 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0015-PlayerItemDamageEvent.patch b/CraftBukkit-Patches/0015-PlayerItemDamageEvent.patch index f81bf235..5891e0f7 100644 --- a/CraftBukkit-Patches/0015-PlayerItemDamageEvent.patch +++ b/CraftBukkit-Patches/0015-PlayerItemDamageEvent.patch @@ -1,4 +1,4 @@ -From 320471f1eb4a8a80d4c1f6be7a4bdabe7f04184a Mon Sep 17 00:00:00 2001 +From 2925c88ed26107938b8321c8e6b29ba3fc3a49fb 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/0016-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0016-Entity-Tracking-Ranges.patch index ad38d9c3..e4ff7655 100644 --- a/CraftBukkit-Patches/0016-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0016-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 933d7d5cbd8d876f7118da1fa90c123f210bc1a1 Mon Sep 17 00:00:00 2001 +From e42d759ca82b9562428380f2e1f3f3da6731896b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -12,7 +12,7 @@ This has multiple benefits: 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames. diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 4ecdeef2..ae31935c 100644 +index 4ecdeef23..ae31935c4 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -104,8 +104,9 @@ public class EntityTracker { @@ -27,7 +27,7 @@ index 4ecdeef2..ae31935c 100644 if (this.trackedEntities.b(entity.getId())) { throw new IllegalStateException("Entity is already tracked!"); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 1d7544ee..b2393688 100644 +index 1d7544ee7..b23936889 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -153,4 +153,19 @@ public class SpigotWorldConfig @@ -52,7 +52,7 @@ index 1d7544ee..b2393688 100644 } diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java new file mode 100644 -index 00000000..4bf4d2ac +index 000000000..4bf4d2ac6 --- /dev/null +++ b/src/main/java/org/spigotmc/TrackingRange.java @@ -0,0 +1,51 @@ diff --git a/CraftBukkit-Patches/0017-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0017-Thread-Naming-and-Tweaks.patch index 3ebadeeb..f0c66b38 100644 --- a/CraftBukkit-Patches/0017-Thread-Naming-and-Tweaks.patch +++ b/CraftBukkit-Patches/0017-Thread-Naming-and-Tweaks.patch @@ -1,4 +1,4 @@ -From f885d18f7b0714d872554f450eebe0f61750ae01 Mon Sep 17 00:00:00 2001 +From de09d3b287fc28c6ea19d389748a0777e5817ef9 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Thread Naming and Tweaks Removes the sleep forever thread and adds useful names for debugging to all staged thread files. diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 24ebc91d..f11bd754 100644 +index 24ebc91da..f11bd7545 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -79,7 +79,7 @@ public class CraftScheduler implements BukkitScheduler { diff --git a/CraftBukkit-Patches/0018-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0018-Close-Unloaded-Save-Files.patch index 6d77f42f..f3f53012 100644 --- a/CraftBukkit-Patches/0018-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0018-Close-Unloaded-Save-Files.patch @@ -1,11 +1,11 @@ -From 46f3801536e6de2150414265d687446c9469118f Mon Sep 17 00:00:00 2001 +From 467c44744486c51d5a2758bd73bc6b4afc1dbe00 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/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 2c59f17f..d394645a 100644 +index 7ef75de20..0e91aeec3 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -11,7 +11,7 @@ import javax.annotation.Nullable; @@ -18,10 +18,10 @@ index 2c59f17f..d394645a 100644 public static synchronized RegionFile a(File file, int i, int j) { File file1 = new File(file, "region"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 259712fc..01ee1917 100644 +index b53223db1..52465acea 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1021,6 +1021,31 @@ public final class CraftServer implements Server { +@@ -1003,6 +1003,31 @@ public final class CraftServer implements Server { worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH)); console.worlds.remove(console.worlds.indexOf(handle)); diff --git a/CraftBukkit-Patches/0019-Remove-o-Option.patch b/CraftBukkit-Patches/0019-Remove-o-Option.patch index 2d5db694..226c5647 100644 --- a/CraftBukkit-Patches/0019-Remove-o-Option.patch +++ b/CraftBukkit-Patches/0019-Remove-o-Option.patch @@ -1,4 +1,4 @@ -From 7e8cadf6c406266c325f5117afa91b2587b3378f Mon Sep 17 00:00:00 2001 +From ba07f51e475982bb1b587ce1152cea4910b8b3e1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 19 May 2013 18:29:48 +1000 Subject: [PATCH] Remove -o Option @@ -6,7 +6,7 @@ Subject: [PATCH] Remove -o Option Serves no purpose other than to confuse users. diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java -index 822ee8a9..5055a4fb 100644 +index 822ee8a98..5055a4fb8 100644 --- a/src/main/java/net/minecraft/server/PropertyManager.java +++ b/src/main/java/net/minecraft/server/PropertyManager.java @@ -54,7 +54,7 @@ public class PropertyManager { diff --git a/CraftBukkit-Patches/0020-Implement-Arrow-API.patch b/CraftBukkit-Patches/0020-Implement-Arrow-API.patch index eb92ee83..be3c5331 100644 --- a/CraftBukkit-Patches/0020-Implement-Arrow-API.patch +++ b/CraftBukkit-Patches/0020-Implement-Arrow-API.patch @@ -1,11 +1,11 @@ -From a2c1c3a8a02e7b42a8534f89e3cf7790011e97bf Mon Sep 17 00:00:00 2001 +From 47f104ba7fb5e1e89a525310db0e08ab454ac177 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/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -index 11ad076e..cc6e22a7 100644 +index 11ad076e1..cc6e22a7c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java @@ -90,6 +90,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow { diff --git a/CraftBukkit-Patches/0021-Hopper-Customisations.patch b/CraftBukkit-Patches/0021-Hopper-Customisations.patch index 8b09403a..bdb1ec13 100644 --- a/CraftBukkit-Patches/0021-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0021-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From 6a6a4aa7124fdc375bae2b217a59c2e0f453b93d Mon Sep 17 00:00:00 2001 +From b33f8ab466abe47e79a3601c35bf5ac9f55d8baa 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 33e24982..8af2d301 100644 +index 4339d74c3..d0d271475 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -115,9 +115,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -107,7 +107,7 @@ index 33e24982..8af2d301 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index b2393688..cc173cb3 100644 +index b23936889..cc173cb3e 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -168,4 +168,20 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0022-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0022-Allow-Disabling-of-Command-Logging.patch index 6f740580..06ea8a0b 100644 --- a/CraftBukkit-Patches/0022-Allow-Disabling-of-Command-Logging.patch +++ b/CraftBukkit-Patches/0022-Allow-Disabling-of-Command-Logging.patch @@ -1,11 +1,11 @@ -From 2fdc9b51ed707545bfa831a742f8671fd2899c35 Mon Sep 17 00:00:00 2001 +From 56cb7e430ebcaa730d606fbf0868a7a55d50c92c 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 0d723548a..d6dddfa5c 100644 +index 66420735c..b32d4c755 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1561,6 +1561,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch index b8090771..3b7dbe7e 100644 --- a/CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch @@ -1,4 +1,4 @@ -From 91dfb21763f8da57c53d4a765395913f41932950 Mon Sep 17 00:00:00 2001 +From 9ce4bd9551226b42402e7fdc7dcc9f29471c62cb 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 @@ -25,10 +25,10 @@ index 8c7c8a043..c9eadd560 100644 if (commandnode2.canUse(commandlistenerwrapper)) { ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 72cc19866..f09b9902b 100644 +index 52465acea..8912d91c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1611,6 +1611,13 @@ public final class CraftServer implements Server { +@@ -1593,6 +1593,13 @@ public final class CraftServer implements Server { } public List tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) { diff --git a/CraftBukkit-Patches/0024-Configurable-Messages.patch b/CraftBukkit-Patches/0024-Configurable-Messages.patch index ebd188b1..ca172fa8 100644 --- a/CraftBukkit-Patches/0024-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0024-Configurable-Messages.patch @@ -1,29 +1,29 @@ -From ea83668bfd97e9d6afe998ae05c6eb95cb15ffea Mon Sep 17 00:00:00 2001 +From 516f840fd039147e63c221e2184912ba776c3ccf 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 fe3f37de..f21450c6 100644 +index f579f105b..387d8a09f 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.c() > 389) { -- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_server", new Object[] { "1.13-pre7"}); -+ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), "1.13-pre7" ) ); // Spigot + if (packethandshakinginsetprotocol.c() > 393) { +- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_server", new Object[] { "1.13"}); ++ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), "1.13" ) ); // Spigot this.b.sendPacket(new PacketLoginOutDisconnect(chatmessage)); this.b.close(chatmessage); - } else if (packethandshakinginsetprotocol.c() < 389) { -- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_client", new Object[] { "1.13-pre7"}); -+ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), "1.13-pre7" ) ); // Spigot + } else if (packethandshakinginsetprotocol.c() < 393) { +- chatmessage = new ChatMessage("multiplayer.disconnect.outdated_client", new Object[] { "1.13"}); ++ chatmessage = new ChatMessage( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), "1.13" ) ); // Spigot this.b.sendPacket(new PacketLoginOutDisconnect(chatmessage)); this.b.close(chatmessage); } else { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 77af1442..80ac1481 100644 +index 2d70ab313..c77d04acd 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -493,7 +493,7 @@ public abstract class PlayerList { @@ -45,7 +45,7 @@ index 77af1442..80ac1481 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 133e833c..44341e2c 100644 +index 8912d91c0..509cb8181 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -674,11 +674,11 @@ public final class CraftServer implements Server { @@ -65,7 +65,7 @@ index 133e833c..44341e2c 100644 return false; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index e53e8013..cec3c4b2 100644 +index e53e8013d..cec3c4b24 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -12,6 +12,7 @@ import java.util.Map; diff --git a/CraftBukkit-Patches/0025-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0025-Allow-Disabling-of-Random-Lighting-Updates.patch index daa991ea..2fcf35dc 100644 --- a/CraftBukkit-Patches/0025-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0025-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,11 +1,11 @@ -From ebe32b34ed8433b4a345d2b942613be22d52c730 Mon Sep 17 00:00:00 2001 +From bcedb8e5809918df0b048317e59d13528efbe4b1 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/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ce895c67..0da706b5 100644 +index 4d5bede24..bd949a1ec 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -446,7 +446,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -18,7 +18,7 @@ index ce895c67..0da706b5 100644 EntityHuman entityhuman = (EntityHuman) this.players.get(i); int j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index cc173cb3..07a883f1 100644 +index cc173cb3e..07a883f19 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -184,4 +184,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0026-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0026-Properly-Close-Inventories.patch index 1ec21ea9..0b1732ae 100644 --- a/CraftBukkit-Patches/0026-Properly-Close-Inventories.patch +++ b/CraftBukkit-Patches/0026-Properly-Close-Inventories.patch @@ -1,4 +1,4 @@ -From 60af6767a2bcbbceb834759c92771e26901cdbb4 Mon Sep 17 00:00:00 2001 +From afc7d64ef2ca1466092c7244a814ba493019bf44 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 27 Jun 2013 17:26:09 +1000 Subject: [PATCH] Properly Close Inventories @@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories Properly close inventories when unloading and switching worlds. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 9a9181be..3f1dce9d 100644 +index bc9bf0041..7f18563e7 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -783,6 +783,18 @@ public class Chunk implements IChunkAccess { diff --git a/CraftBukkit-Patches/0027-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0027-Disallow-Interaction-With-Self.patch index 8f651e3f..3ada933c 100644 --- a/CraftBukkit-Patches/0027-Disallow-Interaction-With-Self.patch +++ b/CraftBukkit-Patches/0027-Disallow-Interaction-With-Self.patch @@ -1,11 +1,11 @@ -From 051dca62ad1b66a8942f5e222b2afa048427188f Mon Sep 17 00:00:00 2001 +From 2a25da41d8fdf80013d67fc6c409abe2d92e0d99 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 d6dddfa5c..5b3abc563 100644 +index b32d4c755..2689186e5 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1723,6 +1723,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0028-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0028-Entity-Mount-and-Dismount-Events.patch index 4e1ab2ca..ceaae6f8 100644 --- a/CraftBukkit-Patches/0028-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0028-Entity-Mount-and-Dismount-Events.patch @@ -1,11 +1,11 @@ -From ac63dd67abe6b9bc827d8fc2787a16718f0f6ec0 Mon Sep 17 00:00:00 2001 +From 860d9ff29fccf8a4cf62fda4595decc61b59cfba Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 27 Feb 2016 10:07:58 +1100 Subject: [PATCH] Entity Mount and Dismount Events diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f3228665..73e19580 100644 +index 855f7ff0a..0e90fd362 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2005,6 +2005,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { diff --git a/CraftBukkit-Patches/0029-Prevent-Ghost-Players-Caused-by-Plugins.patch b/CraftBukkit-Patches/0029-Prevent-Ghost-Players-Caused-by-Plugins.patch index d5cd5d01..0bb03104 100644 --- a/CraftBukkit-Patches/0029-Prevent-Ghost-Players-Caused-by-Plugins.patch +++ b/CraftBukkit-Patches/0029-Prevent-Ghost-Players-Caused-by-Plugins.patch @@ -1,4 +1,4 @@ -From 395500981c5197ad793ff59bd023fe3bf65ede06 Mon Sep 17 00:00:00 2001 +From 6ceb4dfc227c77632270181176a8c967b9b7934e 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 80ac1481..af8e8fd5 100644 +index c77d04acd..668452809 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -633,6 +633,11 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0030-Plug-World-Unload-Memory-Leak.patch b/CraftBukkit-Patches/0030-Plug-World-Unload-Memory-Leak.patch index a87449c4..ca5f6511 100644 --- a/CraftBukkit-Patches/0030-Plug-World-Unload-Memory-Leak.patch +++ b/CraftBukkit-Patches/0030-Plug-World-Unload-Memory-Leak.patch @@ -1,11 +1,11 @@ -From 43cb501b56da2f7c5083128f497be877e82be77a Mon Sep 17 00:00:00 2001 +From 1676d2bdd32f47a559a6279dca5f3939663e432b 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/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java -index 7f1cc205..6a54da4d 100644 +index 61454009f..c912fb8ae 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit diff --git a/CraftBukkit-Patches/0031-Player-Collision-API.patch b/CraftBukkit-Patches/0031-Player-Collision-API.patch index c41e1715..b2a172b4 100644 --- a/CraftBukkit-Patches/0031-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0031-Player-Collision-API.patch @@ -1,11 +1,11 @@ -From 16c3fe0f478f834cbf421318e255e4414703ec2f Mon Sep 17 00:00:00 2001 +From 92d4dbb97be7e481949b3536925b6449eec43f1c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Mar 2016 20:35:09 +1100 Subject: [PATCH] Player Collision API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index db133856..5eead283 100644 +index db1338561..5eead2833 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1580,6 +1580,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0032-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0032-Fully-Disable-Snooper-When-Not-Required.patch index b53c9fec..5875563a 100644 --- a/CraftBukkit-Patches/0032-Fully-Disable-Snooper-When-Not-Required.patch +++ b/CraftBukkit-Patches/0032-Fully-Disable-Snooper-When-Not-Required.patch @@ -1,14 +1,14 @@ -From f3cfa3013d3887cded49e670633d050d9af4d92e Mon Sep 17 00:00:00 2001 +From 2b4662c12d12c06cbc2093549f5e30f990386eaa 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 d000f5bf..be3d54ee 100644 +index de497fa50..4b865bc97 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -765,11 +765,11 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -804,11 +804,11 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } this.methodProfiler.a("snooper"); diff --git a/CraftBukkit-Patches/0033-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0033-Add-Getter-for-Entity-Invulnerability.patch index bb677d59..7b7e0eb0 100644 --- a/CraftBukkit-Patches/0033-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0033-Add-Getter-for-Entity-Invulnerability.patch @@ -1,11 +1,11 @@ -From b9afd3b029842698c3b4a682e6e0628de4859f34 Mon Sep 17 00:00:00 2001 +From f8aab71559d31df53a9c43de94818b675e9cb654 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/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 83eb0788..91d16574 100644 +index 83eb07888..91d165746 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -741,6 +741,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/CraftBukkit-Patches/0034-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0034-Don-t-Special-Case-X-Move-Value.patch index 637a0c7c..318f4633 100644 --- a/CraftBukkit-Patches/0034-Don-t-Special-Case-X-Move-Value.patch +++ b/CraftBukkit-Patches/0034-Don-t-Special-Case-X-Move-Value.patch @@ -1,11 +1,11 @@ -From 54e7015859943db0a37b88e430653eda20cb0416 Mon Sep 17 00:00:00 2001 +From a991962ff3f285f78b8b4ad12be77a36caa520e2 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 6761bced..f016681f 100644 +index 2689186e5..213e0723e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -126,6 +126,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0035-Implement-respawn-API.patch b/CraftBukkit-Patches/0035-Implement-respawn-API.patch index 060c3e37..78b92e5d 100644 --- a/CraftBukkit-Patches/0035-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0035-Implement-respawn-API.patch @@ -1,11 +1,11 @@ -From a067dc923b4e423424156828a8034f19f2e10adb Mon Sep 17 00:00:00 2001 +From c5598619e21173fac2fd4d0e47ea20c1cba99b0a 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/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5eead283..3ce1218a 100644 +index 5eead2833..3ce1218a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1590,6 +1590,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0036-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0036-Arrow-Despawn-Rate.patch index f32a2055..acde1286 100644 --- a/CraftBukkit-Patches/0036-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0036-Arrow-Despawn-Rate.patch @@ -1,11 +1,11 @@ -From 791bb7cf3810373b214e2372d156f734e6521975 Mon Sep 17 00:00:00 2001 +From 8b3e10d9819e9b70e09f2816793b587164654b2e 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/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 1e502917..e16c8e8d 100644 +index 1e5029170..e16c8e8d9 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -258,7 +258,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -18,7 +18,7 @@ index 1e502917..e16c8e8d 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 07a883f1..a4f1645a 100644 +index 07a883f19..a4f1645a6 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -191,4 +191,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0037-Watchdog-Thread.patch b/CraftBukkit-Patches/0037-Watchdog-Thread.patch index e2ec85be..c89d4ab0 100644 --- a/CraftBukkit-Patches/0037-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0037-Watchdog-Thread.patch @@ -1,11 +1,11 @@ -From 680cffea3e50b4da3686449c4d19658d8507b1f0 Mon Sep 17 00:00:00 2001 +From 5ee809cb94e282dfd3f27eb98337ab254bc4d3c9 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 427668ec..52afacb8 100644 +index dbd74d384..f90a43929 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -301,7 +301,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -18,10 +18,10 @@ index 427668ec..52afacb8 100644 thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index be3d54ee..f2b4462b 100644 +index 4b865bc97..af93b811c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -675,6 +675,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -714,6 +714,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati this.a(crashreport); } finally { try { @@ -29,8 +29,8 @@ index be3d54ee..f2b4462b 100644 this.isStopped = true; this.stop(); } catch (Throwable throwable1) { -@@ -780,6 +781,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati - this.ao = this.ao * 0.8F + (float) l / 1000000.0F * 0.19999999F; +@@ -819,6 +820,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati + this.ap = this.ap * 0.8F + (float) l / 1000000.0F * 0.19999999F; this.methodProfiler.e(); this.methodProfiler.e(); + org.spigotmc.WatchdogThread.tick(); // Spigot @@ -38,10 +38,10 @@ index be3d54ee..f2b4462b 100644 org.spigotmc.CustomTimingsHandler.tick(); // Spigot } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 44341e2c..ac0a447f 100644 +index 509cb8181..2ef172a4e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1829,6 +1829,11 @@ public final class CraftServer implements Server { +@@ -1811,6 +1811,11 @@ public final class CraftServer implements Server { { return org.spigotmc.SpigotConfig.config; } @@ -55,7 +55,7 @@ index 44341e2c..ac0a447f 100644 public Spigot spigot() diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java new file mode 100644 -index 00000000..49768734 +index 000000000..49768734d --- /dev/null +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -0,0 +1,132 @@ @@ -192,7 +192,7 @@ index 00000000..49768734 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index cec3c4b2..d8145db9 100644 +index cec3c4b24..d8145db91 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -200,4 +200,18 @@ public class SpigotConfig @@ -216,7 +216,7 @@ index cec3c4b2..d8145db9 100644 } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java new file mode 100644 -index 00000000..de08ad67 +index 000000000..de08ad67f --- /dev/null +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -0,0 +1,117 @@ diff --git a/CraftBukkit-Patches/0038-Fix-Broken-Async-Chat.patch b/CraftBukkit-Patches/0038-Fix-Broken-Async-Chat.patch index bdf3f9f5..79d06755 100644 --- a/CraftBukkit-Patches/0038-Fix-Broken-Async-Chat.patch +++ b/CraftBukkit-Patches/0038-Fix-Broken-Async-Chat.patch @@ -1,11 +1,11 @@ -From a890231d61b77c921b13e8b82dca7934372a5406 Mon Sep 17 00:00:00 2001 +From 850d07787db55340ab76908b9e3fd580531740a0 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/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java -index cfea4d54..c6dbfe30 100644 +index cfea4d549..c6dbfe302 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java @@ -24,7 +24,24 @@ public class PacketPlayInChat implements Packet { diff --git a/CraftBukkit-Patches/0039-Fire-PreLogin-Events-in-Offline-Mode.patch b/CraftBukkit-Patches/0039-Fire-PreLogin-Events-in-Offline-Mode.patch index 44c39f42..6a388401 100644 --- a/CraftBukkit-Patches/0039-Fire-PreLogin-Events-in-Offline-Mode.patch +++ b/CraftBukkit-Patches/0039-Fire-PreLogin-Events-in-Offline-Mode.patch @@ -1,11 +1,11 @@ -From cddb2fcaeec9cb3f0dfc6d89faa973e28f9c5159 Mon Sep 17 00:00:00 2001 +From 6240ab1bd948a8462b44a216c76218bbfbc2486c 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/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c945f07f..e2ed8aef 100644 +index acc2f0b60..0cf9d4bde 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -93,10 +93,23 @@ public class LoginListener implements PacketLoginInListener, ITickable { diff --git a/CraftBukkit-Patches/0040-BungeeCord-Support.patch b/CraftBukkit-Patches/0040-BungeeCord-Support.patch index 70834ba7..f7568af3 100644 --- a/CraftBukkit-Patches/0040-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0040-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 3076d6666e63bc2b262616b1660f15adc7b49ec2 Mon Sep 17 00:00:00 2001 +From a3883ae11de748a8f4482a557fe68d93dd109a9b 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 f21450c6..7c75433f 100644 +index 387d8a09f..5b784002f 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 f21450c6..7c75433f 100644 } break; diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index e2ed8aef..2f6d79b0 100644 +index 0cf9d4bde..a22f4c55e 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -96,9 +96,24 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -75,7 +75,7 @@ index e2ed8aef..2f6d79b0 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 7d425735..3326e959 100644 +index 8a9b5046c..f3f77aebe 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -47,7 +47,11 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -104,7 +104,7 @@ index 7d425735..3326e959 100644 + // Spigot End } diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java -index 47b871df..7acdac55 100644 +index 47b871dfc..7acdac55e 100644 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java @@ -13,7 +13,7 @@ public class PacketHandshakingInSetProtocol implements Packet Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression Ability to configure if Zombies will be aggressive towards Villagers. diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index a1d03e56..b24e73f2 100644 +index 581be66bc..3f0e636b7 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -54,7 +54,7 @@ public class EntityZombie extends EntityMonster { @@ -19,7 +19,7 @@ index a1d03e56..b24e73f2 100644 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget(this, EntityTurtle.class, 10, true, false, EntityTurtle.bC)); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index a4f1645a..14e33e58 100644 +index a4f1645a6..14e33e588 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -198,4 +198,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0042-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0042-Configurable-Amount-of-Netty-Threads.patch index 8ce686ef..890e5d02 100644 --- a/CraftBukkit-Patches/0042-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0042-Configurable-Amount-of-Netty-Threads.patch @@ -1,4 +1,4 @@ -From a87d0caffaaae5692d683293b8dc36688e274056 Mon Sep 17 00:00:00 2001 +From 98f3659fa74d4ca72ada8fd847c2f8a3606767c0 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 f2b4462b..69a75bb1 100644 +index af93b811c..e1732045e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -73,7 +73,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -18,7 +18,7 @@ index f2b4462b..69a75bb1 100644 private final ServerPing n = new ServerPing(); private final Random o = new Random(); public final DataFixer dataConverterManager; -@@ -164,7 +164,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -165,7 +165,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati this.W = gameprofilerepository; this.X = usercache; // this.universe = file; // CraftBukkit @@ -27,7 +27,7 @@ index f2b4462b..69a75bb1 100644 // this.convertable = file == null ? null : new WorldLoaderServer(file.toPath(), file.toPath().resolve("../backups"), datafixer); // CraftBukkit - moved to DedicatedServer.init this.dataConverterManager = datafixer; this.ac.a((IResourcePackListener) this.ah); -@@ -1367,7 +1367,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -1421,7 +1421,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } public ServerConnection getServerConnection() { @@ -37,7 +37,7 @@ index f2b4462b..69a75bb1 100644 public boolean ai() { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 06081dc6..a4200e43 100644 +index 06081dc64..a4200e43e 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -224,4 +224,11 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0043-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0043-Log-Cause-of-Unexpected-Exceptions.patch index 26d5d796..e041856e 100644 --- a/CraftBukkit-Patches/0043-Log-Cause-of-Unexpected-Exceptions.patch +++ b/CraftBukkit-Patches/0043-Log-Cause-of-Unexpected-Exceptions.patch @@ -1,14 +1,14 @@ -From 562bf961326fee4e462a60eba2f20fa90bd8e79c Mon Sep 17 00:00:00 2001 +From 2baf905d9336b0fa0eadf228279e0136ba1e8878 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 69a75bb1..442f101d 100644 +index e1732045e..fdebfc5c7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -656,6 +656,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -695,6 +695,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } } catch (Throwable throwable) { MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable); diff --git a/CraftBukkit-Patches/0044-Save-ticks-lived-to-nbttag.patch b/CraftBukkit-Patches/0044-Save-ticks-lived-to-nbttag.patch index 8970b3ce..04bfcd57 100644 --- a/CraftBukkit-Patches/0044-Save-ticks-lived-to-nbttag.patch +++ b/CraftBukkit-Patches/0044-Save-ticks-lived-to-nbttag.patch @@ -1,11 +1,11 @@ -From c4df719b0f451aa78b6d62a11caebe3ef7b008d4 Mon Sep 17 00:00:00 2001 +From 9805c14a8207f1f272163f1b522b344ef6fe6027 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/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 73e19580..9ea87855 100644 +index 0e90fd362..5017c95dd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1566,6 +1566,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { diff --git a/CraftBukkit-Patches/0045-Add-Option-to-Nerf-Mobs-from-Spawners.patch b/CraftBukkit-Patches/0045-Add-Option-to-Nerf-Mobs-from-Spawners.patch index e16c623b..aed3f693 100644 --- a/CraftBukkit-Patches/0045-Add-Option-to-Nerf-Mobs-from-Spawners.patch +++ b/CraftBukkit-Patches/0045-Add-Option-to-Nerf-Mobs-from-Spawners.patch @@ -1,11 +1,11 @@ -From 4c1269fe38bd4fa2653cc320ab9a589d06fbe724 Mon Sep 17 00:00:00 2001 +From 8aaeef929cb618d455cb2385083bca339b3da902 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 Spawners diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9ea87855..9d116c94 100644 +index 5017c95dd..03e395aed 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -17,7 +17,7 @@ index 9ea87855..9d116c94 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 3a128aa9..5de20721 100644 +index 1b1c975e7..d24ff109c 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -638,6 +638,12 @@ public abstract class EntityInsentient extends EntityLiving { @@ -34,7 +34,7 @@ index 3a128aa9..5de20721 100644 this.bC.a(); this.world.methodProfiler.e(); diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 3bb5a06c..967308d9 100644 +index 3bb5a06cb..967308d97 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -110,7 +110,12 @@ public abstract class MobSpawnerAbstract { @@ -52,7 +52,7 @@ index 3bb5a06c..967308d9 100644 world.triggerEffect(2004, blockposition, 0); if (entityinsentient != null) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 14e33e58..6c506841 100644 +index 14e33e588..6c5068413 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -205,4 +205,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0046-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0046-Disable-Connected-Check-on-setScoreboard.patch index a7ebb2af..72f5d6e3 100644 --- a/CraftBukkit-Patches/0046-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0046-Disable-Connected-Check-on-setScoreboard.patch @@ -1,11 +1,11 @@ -From 711d35da426d0c3b66cc6d9c99b3169104a4bbe2 Mon Sep 17 00:00:00 2001 +From 6be643139b67f68b9c43a85398d096bf9ccaa789 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/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6290c937..5f9b2762 100644 +index 6290c9374..5f9b27624 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1380,7 +1380,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0047-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0047-Add-Late-Bind-Option.patch index c7000848..b452c7fe 100644 --- a/CraftBukkit-Patches/0047-Add-Late-Bind-Option.patch +++ b/CraftBukkit-Patches/0047-Add-Late-Bind-Option.patch @@ -1,4 +1,4 @@ -From d3be764521528ea92a26c2fead4e27c75926e0bd Mon Sep 17 00:00:00 2001 +From a084d1a1a45dd0029d2be22e969885fe16c470ec 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,7 +6,7 @@ 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 52afacb8..a9f17c6d 100644 +index f90a43929..3e0d513d6 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -188,6 +188,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -44,7 +44,7 @@ index 52afacb8..a9f17c6d 100644 Thread thread1 = new Thread(new ThreadWatchdog(this)); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index a4200e43..33f0e3b8 100644 +index a4200e43e..33f0e3b87 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -231,4 +231,9 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0048-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0048-Allow-statistics-to-be-disabled-forced.patch index b48f701f..7cf9807e 100644 --- a/CraftBukkit-Patches/0048-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0048-Allow-statistics-to-be-disabled-forced.patch @@ -1,11 +1,11 @@ -From 1e4c0c34f6dea899fdea626447f1363a83b6fbd1 Mon Sep 17 00:00:00 2001 +From b8257bbec8955bda3e6e3caa5e12a0f056ddabbc 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 3215f9dd..172f72fd 100644 +index 38ff3b662..07e7db455 100644 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java @@ -37,6 +37,13 @@ public class ServerStatisticManager extends StatisticManager { @@ -39,7 +39,7 @@ index 3215f9dd..172f72fd 100644 this.e.add(statistic); } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 33f0e3b8..5d3060c0 100644 +index 33f0e3b87..5d3060c01 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -10,10 +10,14 @@ import java.util.HashMap; diff --git a/CraftBukkit-Patches/0049-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0049-Try-and-Debug-Crash-Reports-Crashing.patch index 8be69efe..8d191584 100644 --- a/CraftBukkit-Patches/0049-Try-and-Debug-Crash-Reports-Crashing.patch +++ b/CraftBukkit-Patches/0049-Try-and-Debug-Crash-Reports-Crashing.patch @@ -1,14 +1,14 @@ -From a094113287e731e80af4e20c5fefd711fe4451ed Mon Sep 17 00:00:00 2001 +From b0ddc42c7e1135b3cbc7c2280e3017ef64accc81 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 442f101d..6638ee27 100644 +index fdebfc5c7..0c776692b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -860,7 +860,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -899,7 +899,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati worldserver.doTick(); worldserver.timings.doTick.stopTiming(); // Spigot } catch (Throwable throwable) { @@ -22,7 +22,7 @@ index 442f101d..6638ee27 100644 worldserver.a(crashreport); throw new ReportedException(crashreport); } -@@ -870,7 +876,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -909,7 +915,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati worldserver.tickEntities(); worldserver.timings.tickEntities.stopTiming(); // Spigot } catch (Throwable throwable1) { diff --git a/CraftBukkit-Patches/0050-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0050-Improve-AutoSave-Mechanism.patch index e66a29e6..b10f694a 100644 --- a/CraftBukkit-Patches/0050-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0050-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From ccbc6c919ce4a9b02098047e9b9f1432abc2f189 Mon Sep 17 00:00:00 2001 +From 3601e4b8cca85b621936b3a6fd09df3a7a5d54f1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Improve AutoSave Mechanism @@ -11,7 +11,7 @@ Instead we will mimic the save-all command in its behaviour, which is both safe Also, only save modified chunks, or chunks with entities after 4 auto save passes diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 3f1dce9d..e54b84ba 100644 +index 7f18563e7..d5aaf872a 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -904,7 +904,7 @@ public class Chunk implements IChunkAccess { @@ -24,7 +24,7 @@ index 3f1dce9d..e54b84ba 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 3e719d5c..62925a0c 100644 +index 3e719d5cd..62925a0c7 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -250,7 +250,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -37,10 +37,10 @@ index 3e719d5c..62925a0c 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6638ee27..65fd6544 100644 +index 0c776692b..7aa788871 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -766,7 +766,17 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -805,7 +805,17 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati SpigotTimings.worldSaveTimer.startTiming(); // Spigot this.methodProfiler.a("save"); this.s.savePlayers(); @@ -60,7 +60,7 @@ index 6638ee27..65fd6544 100644 SpigotTimings.worldSaveTimer.stopTiming(); // Spigot } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c6faa4bf..1834fae6 100644 +index c6faa4bfe..1834fae6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -727,12 +727,17 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0051-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch b/CraftBukkit-Patches/0051-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch index d70ae9e1..8dfa95c6 100644 --- a/CraftBukkit-Patches/0051-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch +++ b/CraftBukkit-Patches/0051-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch @@ -1,11 +1,11 @@ -From 7b7b7016d20cb1f94f97f42e392e008401889f41 Mon Sep 17 00:00:00 2001 +From 752a672aa6dab38a080f4de2c722ba0ef3b5b36a 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/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java -index 6f8d3748..11ffa6c3 100644 +index 6f8d3748b..11ffa6c34 100644 --- a/src/main/java/net/minecraft/server/NBTTagByteArray.java +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java @@ -41,6 +41,7 @@ public class NBTTagByteArray extends NBTList { @@ -17,7 +17,7 @@ index 6f8d3748..11ffa6c3 100644 nbtreadlimiter.a((long) (8 * j)); this.data = new byte[j]; diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java -index 1022c00b..f5c9b97d 100644 +index 1022c00be..f5c9b97d5 100644 --- a/src/main/java/net/minecraft/server/NBTTagIntArray.java +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java @@ -49,6 +49,7 @@ public class NBTTagIntArray extends NBTList { diff --git a/CraftBukkit-Patches/0052-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0052-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index e1935f9c..8e9ffe7b 100644 --- a/CraftBukkit-Patches/0052-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0052-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,11 +1,11 @@ -From ee225a6ec9d87ef2e9de7011bb1ce6c3ada4d81d Mon Sep 17 00:00:00 2001 +From 7e6dc0a4d7cfbf4c492a467a1aabd7082c94931d 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/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java -index 346d7c41..1f6089ac 100644 +index 346d7c41b..1f6089ac5 100644 --- a/src/main/java/net/minecraft/server/BlockPortal.java +++ b/src/main/java/net/minecraft/server/BlockPortal.java @@ -33,7 +33,7 @@ public class BlockPortal extends Block { @@ -18,7 +18,7 @@ index 346d7c41..1f6089ac 100644 BlockPosition blockposition1; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 6c506841..243e2f5a 100644 +index 6c5068413..243e2f5a1 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -212,4 +212,11 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0053-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0053-Highly-Optimized-Tick-Loop.patch index c5a752d3..b03728e1 100644 --- a/CraftBukkit-Patches/0053-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0053-Highly-Optimized-Tick-Loop.patch @@ -1,14 +1,14 @@ -From 074e1c77789736133f8c4e003315ab01662f5aa8 Mon Sep 17 00:00:00 2001 +From 7316080501bd346405991b9dc4d68c8dfa363267 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 26 Jan 2017 21:50:51 +0000 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 bb130be80..e2f70ff0e 100644 +index 7aa788871..540079fcb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -146,6 +146,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -147,6 +147,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati public File bukkitDataPackFolder; public CommandDispatcher vanillaCommandDispatcher; // CraftBukkit end @@ -21,7 +21,7 @@ index bb130be80..e2f70ff0e 100644 public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) { this.ac = new ResourceManager(EnumResourcePackType.SERVER_DATA); -@@ -621,6 +627,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -660,6 +666,13 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati this.isRunning = false; } @@ -35,8 +35,8 @@ index bb130be80..e2f70ff0e 100644 public void run() { try { if (this.init()) { -@@ -629,28 +642,36 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati - this.n.setServerInfo(new ServerPing.ServerData("1.13-pre7", 389)); +@@ -668,28 +681,36 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati + this.n.setServerInfo(new ServerPing.ServerData("1.13", 393)); this.a(this.n); + // Spigot start diff --git a/CraftBukkit-Patches/0054-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0054-Configurable-Ping-Sample-Size.patch index 260c668e..545167a3 100644 --- a/CraftBukkit-Patches/0054-Configurable-Ping-Sample-Size.patch +++ b/CraftBukkit-Patches/0054-Configurable-Ping-Sample-Size.patch @@ -1,11 +1,11 @@ -From 139c93cca8401e91fe49850d94eae0a36e66b44a Mon Sep 17 00:00:00 2001 +From 8ab5431b009720eba1310517edd717f307cbeea1 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 0e506305..c9edd289 100644 +index 0e506305e..c9edd289a 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -108,6 +108,13 @@ public class PacketStatusListener implements PacketStatusInListener { @@ -23,7 +23,7 @@ index 0e506305..c9edd289 100644 ServerPing ping = new ServerPing(); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 6096cccc..c5fb09e0 100644 +index 6096cccc1..c5fb09e01 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -271,4 +271,11 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0055-Add-Optional-Tick-Shuffling.patch b/CraftBukkit-Patches/0055-Add-Optional-Tick-Shuffling.patch index 05cd96a4..45d380ec 100644 --- a/CraftBukkit-Patches/0055-Add-Optional-Tick-Shuffling.patch +++ b/CraftBukkit-Patches/0055-Add-Optional-Tick-Shuffling.patch @@ -1,4 +1,4 @@ -From 9b8e7c15bb03672a120fa6e4b85c19dd961e4446 Mon Sep 17 00:00:00 2001 +From 99c7aceacfaffb6360904d9f2993bd2f330d28f4 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 d62670ac..440bb0c8 100644 +index d62670ac5..440bb0c8b 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -102,6 +102,13 @@ public class ServerConnection { @@ -24,7 +24,7 @@ index d62670ac..440bb0c8 100644 while (iterator.hasNext()) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index c5fb09e0..19eb87a4 100644 +index c5fb09e01..19eb87a4b 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -278,4 +278,10 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0056-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0056-Implement-Locale-Getter-for-Players.patch index e7d876eb..d0cf8139 100644 --- a/CraftBukkit-Patches/0056-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0056-Implement-Locale-Getter-for-Players.patch @@ -1,11 +1,11 @@ -From 127e38948a8866e678a0170d48b665de11ed44eb Mon Sep 17 00:00:00 2001 +From 3201138841ef933823db953524673fd221537c99 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/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5f9b2762..b9e54138 100644 +index 5f9b27624..b9e541380 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1605,6 +1605,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0057-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0057-Spam-Filter-Exclusions.patch index 14da1729..41005df6 100644 --- a/CraftBukkit-Patches/0057-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0057-Spam-Filter-Exclusions.patch @@ -1,11 +1,11 @@ -From dbb0eb899c586cac19a48c257e8859502df08680 Mon Sep 17 00:00:00 2001 +From 4ce10e2a2a24b602abb02c219fd7b52811af3e32 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 3b208761c..6f7b41957 100644 +index 213e0723e..a105669a6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1467,9 +1467,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0058-Add-Option-to-Silence-CommandBlock-Console.patch b/CraftBukkit-Patches/0058-Add-Option-to-Silence-CommandBlock-Console.patch index 5b2fdb3a..af81a88d 100644 --- a/CraftBukkit-Patches/0058-Add-Option-to-Silence-CommandBlock-Console.patch +++ b/CraftBukkit-Patches/0058-Add-Option-to-Silence-CommandBlock-Console.patch @@ -1,4 +1,4 @@ -From 848a65e62414e5d31305fc197f4b3873167567b2 Mon Sep 17 00:00:00 2001 +From 70a496c07905877413da2a7e17add4208c77e885 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/0059-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0059-Add-support-for-fetching-hidden-players.patch index 736bff5b..77d3af1d 100644 --- a/CraftBukkit-Patches/0059-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0059-Add-support-for-fetching-hidden-players.patch @@ -1,11 +1,11 @@ -From 60ad8ba486b4e6ebbc46a9516aa6112396f1bd53 Mon Sep 17 00:00:00 2001 +From f91b97a9effd88b54c64c056fea59e299d9b013e Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b9e54138..a2ab1c19 100644 +index b9e541380..a2ab1c194 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1611,6 +1611,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0060-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0060-Cap-Channel-Registrations.patch index 7a3eeab0..966c3ecd 100644 --- a/CraftBukkit-Patches/0060-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0060-Cap-Channel-Registrations.patch @@ -1,11 +1,11 @@ -From 05ffe01e80160f1010a53930600ad6af40211070 Mon Sep 17 00:00:00 2001 +From 53bac13f71688798724fc859ecd09e44eeb94b55 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a2ab1c19..4aa50915 100644 +index a2ab1c194..4aa50915a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1198,6 +1198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0061-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch b/CraftBukkit-Patches/0061-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch index fe2374ab..0e1dfe62 100644 --- a/CraftBukkit-Patches/0061-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch +++ b/CraftBukkit-Patches/0061-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch @@ -1,11 +1,11 @@ -From 14a0f7e27a5cd8da61035d1009b24776bbce76c0 Mon Sep 17 00:00:00 2001 +From 12379abc3129397bc7351f4e492d5e96ac96277a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 12 Feb 2014 20:44:14 +0000 Subject: [PATCH] Allow vanilla commands to be the main version of a command diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3d0cde333..fd62c3a62 100644 +index eb4ba4c40..36bab78d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -339,8 +339,11 @@ public final class CraftServer implements Server { diff --git a/CraftBukkit-Patches/0062-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0062-Implement-Silenceable-Lightning-API.patch index 9e835166..85617fcc 100644 --- a/CraftBukkit-Patches/0062-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0062-Implement-Silenceable-Lightning-API.patch @@ -1,11 +1,11 @@ -From b6038ea6cce9ecb3ed8912c89e256dae71625210 Mon Sep 17 00:00:00 2001 +From 8d560f4efa523d049243d3b8d252498c49a0ddf9 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/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java -index e69d6cf5..afbe43dd 100644 +index e69d6cf55..afbe43dd3 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -15,6 +15,7 @@ public class EntityLightning extends EntityWeather { @@ -41,7 +41,7 @@ index e69d6cf5..afbe43dd 100644 // this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + this.random.nextFloat() * 0.2F; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1834fae6..a5dd3934 100644 +index 1834fae6c..a5dd39348 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1590,6 +1590,22 @@ public class CraftWorld implements World { @@ -68,7 +68,7 @@ index 1834fae6..a5dd3934 100644 public Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java -index 194d830e..ddd5ccd5 100644 +index 194d830e1..ddd5ccd58 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java @@ -31,6 +31,11 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike diff --git a/CraftBukkit-Patches/0063-Use-one-PermissibleBase-for-all-Command-Blocks.patch b/CraftBukkit-Patches/0063-Use-one-PermissibleBase-for-all-Command-Blocks.patch index 5d090fdd..e585332d 100644 --- a/CraftBukkit-Patches/0063-Use-one-PermissibleBase-for-all-Command-Blocks.patch +++ b/CraftBukkit-Patches/0063-Use-one-PermissibleBase-for-all-Command-Blocks.patch @@ -1,11 +1,11 @@ -From 24434e246227e251acdcbf60292d7bdd076cdc44 Mon Sep 17 00:00:00 2001 +From fa6c7bbe7f0097b7a941e69129162ab9ff7ab4fe 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/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java -index a461a935..c10a8445 100644 +index a461a935b..c10a84452 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java @@ -12,9 +12,18 @@ import org.bukkit.plugin.Plugin; diff --git a/CraftBukkit-Patches/0064-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0064-Prevent-hoppers-from-loading-chunks.patch index ea6b0bb3..a5b2c1f5 100644 --- a/CraftBukkit-Patches/0064-Prevent-hoppers-from-loading-chunks.patch +++ b/CraftBukkit-Patches/0064-Prevent-hoppers-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From b7632e9926bd8dfb2639a2767bf3f654116231e3 Mon Sep 17 00:00:00 2001 +From ead1552c2df22903a65e42b0654fb2f3c46032e9 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 8af2d301..fa7ba510 100644 +index d0d271475..bb41d4780 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -523,6 +523,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi diff --git a/CraftBukkit-Patches/0065-Guard-Entity-List.patch b/CraftBukkit-Patches/0065-Guard-Entity-List.patch index 9a9dc75a..049ef1a3 100644 --- a/CraftBukkit-Patches/0065-Guard-Entity-List.patch +++ b/CraftBukkit-Patches/0065-Guard-Entity-List.patch @@ -1,11 +1,11 @@ -From 6e42d463a1530690bd442a3fba5e19485900f5e2 Mon Sep 17 00:00:00 2001 +From e939bbe74f0757b7c829834e99b0fc9070dbda5f Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Mar 2014 09:03:28 +1100 Subject: [PATCH] Guard Entity List diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6207a4cd..33f606a9 100644 +index ce5fa30b2..f751fafa9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -38,7 +38,32 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose diff --git a/CraftBukkit-Patches/0066-Fix-ConcurrentModificationException-while-being-idle.patch b/CraftBukkit-Patches/0066-Fix-ConcurrentModificationException-while-being-idle.patch index 3709102a..0d56de19 100644 --- a/CraftBukkit-Patches/0066-Fix-ConcurrentModificationException-while-being-idle.patch +++ b/CraftBukkit-Patches/0066-Fix-ConcurrentModificationException-while-being-idle.patch @@ -1,4 +1,4 @@ -From 32a9459a3b6b9b8d9ca0294422655e8cdf4c5f12 Mon Sep 17 00:00:00 2001 +From 16f40ed10458c25decc5da89c6f1925cbf1cde87 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 14 Jan 2014 20:11:25 +0000 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 33f606a9..d27a57b1 100644 +index f751fafa9..4223b219a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,4 +1,4 @@ diff --git a/CraftBukkit-Patches/0067-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0067-Cancellable-WitherSkull-potion-effect.patch index f2d107c7..3a8e77a0 100644 --- a/CraftBukkit-Patches/0067-Cancellable-WitherSkull-potion-effect.patch +++ b/CraftBukkit-Patches/0067-Cancellable-WitherSkull-potion-effect.patch @@ -1,11 +1,11 @@ -From ff5d0b48c9568018612a4fff3a14d2094335b364 Mon Sep 17 00:00:00 2001 +From f21970bbc19a03a0513a2f503cbce4488429e334 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/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java -index d43503d2..e9d3363b 100644 +index 8249bf112..0103837ab 100644 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java @@ -29,8 +29,11 @@ public class EntityWitherSkull extends EntityFireball { diff --git a/CraftBukkit-Patches/0068-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0068-Descriptive-kick-reasons-instead-of-Nope.patch index 4a037908..53236924 100644 --- a/CraftBukkit-Patches/0068-Descriptive-kick-reasons-instead-of-Nope.patch +++ b/CraftBukkit-Patches/0068-Descriptive-kick-reasons-instead-of-Nope.patch @@ -1,11 +1,11 @@ -From 813648acc530f015bc4100e29a6494b1420f3db9 Mon Sep 17 00:00:00 2001 +From f546f98e686f069e6ce25bfaf5f64ffd174e92ae Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:30:05 -0400 Subject: [PATCH] Descriptive kick reasons instead of Nope! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2a9515923..015959b9f 100644 +index 03e395aed..5046ecb3b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -289,7 +289,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -27,7 +27,7 @@ index 2a9515923..015959b9f 100644 f1 = 0; } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6f7b41957..c728e61c1 100644 +index a105669a6..862449c98 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1388,7 +1388,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0069-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0069-Configurable-dragon-death-and-wither-spawn-sounds.patch index 1e4d6432..d4429c79 100644 --- a/CraftBukkit-Patches/0069-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0069-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,11 +1,11 @@ -From 6d474644498394fe7a6d51c12ec2b589f3a26369 Mon Sep 17 00:00:00 2001 +From ce5cfece16a036cadb7677236bb4cdb9107e0daf Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index e8cb895c..24cce6c0 100644 +index caf1a0045..bbd807315 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -571,7 +571,24 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo @@ -35,7 +35,7 @@ index e8cb895c..24cce6c0 100644 } diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 4c335f35..e9d9ec23 100644 +index 696e1331e..4f73b02ba 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -204,6 +204,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -47,7 +47,7 @@ index 4c335f35..e9d9ec23 100644 double deltaLength = Math.sqrt(distanceSquared); double relativeX = player.locX + (deltaX / deltaLength) * viewDistance; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 243e2f5a..96bf3ade 100644 +index 243e2f5a1..96bf3adec 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -219,4 +219,16 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0070-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0070-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch index 0afe799a..56d20ca0 100644 --- a/CraftBukkit-Patches/0070-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch +++ b/CraftBukkit-Patches/0070-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch @@ -1,4 +1,4 @@ -From f479083474552177000f3d96eadacb6c362e30ac Mon Sep 17 00:00:00 2001 +From ded2da6074f7182c22771e947747c65b17a62884 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Apr 2014 11:16:34 +0100 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang @@ -6,10 +6,10 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index aa215fde..d13e9138 100644 +index 540079fcb..d644ea0f4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1143,7 +1143,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -1197,7 +1197,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } public String getServerModName() { diff --git a/CraftBukkit-Patches/0071-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0071-Treat-Bungee-as-Online-Mode.patch index 3df8e38c..18d71eb5 100644 --- a/CraftBukkit-Patches/0071-Treat-Bungee-as-Online-Mode.patch +++ b/CraftBukkit-Patches/0071-Treat-Bungee-as-Online-Mode.patch @@ -1,11 +1,11 @@ -From c99dd7d1bc7b4e0cf249009dbe294f4b49982989 Mon Sep 17 00:00:00 2001 +From ec4d4798fdd7edd5aaf620ba45f4fa5f9f41ac5b 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/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index a9f17c6d..65ca0bdd 100644 +index 3e0d513d6..21dae1f88 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -208,7 +208,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -25,7 +25,7 @@ index a9f17c6d..65ca0bdd 100644 } diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index b00938b2..33e5aaf2 100644 +index b00938b21..33e5aaf2c 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -59,7 +59,7 @@ public class NameReferencingFileConverter { diff --git a/CraftBukkit-Patches/0072-Add-Conversion-Message.patch b/CraftBukkit-Patches/0072-Add-Conversion-Message.patch index 22b6febf..e9508a11 100644 --- a/CraftBukkit-Patches/0072-Add-Conversion-Message.patch +++ b/CraftBukkit-Patches/0072-Add-Conversion-Message.patch @@ -1,11 +1,11 @@ -From 02cf73d1d5d87cd593eddefd6507133c19c3c620 Mon Sep 17 00:00:00 2001 +From 185a59e2bb9179a747ce89fd758dff0ffc7404d4 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 65ca0bdd..6283fce5 100644 +index 21dae1f88..5dd323b12 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -577,6 +577,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0073-Print-Stack-on-InternalException.patch b/CraftBukkit-Patches/0073-Print-Stack-on-InternalException.patch index 33172241..6a28264f 100644 --- a/CraftBukkit-Patches/0073-Print-Stack-on-InternalException.patch +++ b/CraftBukkit-Patches/0073-Print-Stack-on-InternalException.patch @@ -1,11 +1,11 @@ -From 34863f6743d3a7632edc2536f64869dd665ad0b5 Mon Sep 17 00:00:00 2001 +From 00d0f8b03e53606cd733e70f39f03079759f3b8d 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/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 3326e959..c7f55041 100644 +index f3f77aebe..88aad6d43 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -118,6 +118,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/CraftBukkit-Patches/0074-Use-Offline-Player-Data-Once-if-Required.patch b/CraftBukkit-Patches/0074-Use-Offline-Player-Data-Once-if-Required.patch index 1b03589f..a2b66d6c 100644 --- a/CraftBukkit-Patches/0074-Use-Offline-Player-Data-Once-if-Required.patch +++ b/CraftBukkit-Patches/0074-Use-Offline-Player-Data-Once-if-Required.patch @@ -1,4 +1,4 @@ -From 446423e61e73f89a2c9e8f4d5bfa7d0ed5915471 Mon Sep 17 00:00:00 2001 +From e4fbbb49183517488d5af67b48d81fe24dc2c344 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. @@ -6,7 +6,7 @@ Subject: [PATCH] Use Offline Player Data Once if Required. If we are online mode and the only copy of player data we can find is the player's offline mode data, we will attempt a once off conversion by reading this data and then renaming the file so it won't be used again. diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 752da4a8..0e0ebd40 100644 +index 752da4a80..0e0ebd403 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -167,10 +167,28 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { diff --git a/CraftBukkit-Patches/0075-Use-Provided-Case-for-Non-Existent-Offline-Players.patch b/CraftBukkit-Patches/0075-Use-Provided-Case-for-Non-Existent-Offline-Players.patch index 1feae3eb..42332d7c 100644 --- a/CraftBukkit-Patches/0075-Use-Provided-Case-for-Non-Existent-Offline-Players.patch +++ b/CraftBukkit-Patches/0075-Use-Provided-Case-for-Non-Existent-Offline-Players.patch @@ -1,11 +1,11 @@ -From 999deb46752efdd5ea71bb51f655335b7b2a80a3 Mon Sep 17 00:00:00 2001 +From b866dfa6c02205e349ffe4da6dde1619526fb4fd 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 08ba68fb..674243c4 100644 +index 08ba68fba..674243c49 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -154,7 +154,7 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0076-Check-for-blank-OfflinePlayer-Names.patch b/CraftBukkit-Patches/0076-Check-for-blank-OfflinePlayer-Names.patch index 60dc99d2..a08f8f59 100644 --- a/CraftBukkit-Patches/0076-Check-for-blank-OfflinePlayer-Names.patch +++ b/CraftBukkit-Patches/0076-Check-for-blank-OfflinePlayer-Names.patch @@ -1,14 +1,14 @@ -From 2aa66135e5d0e1f6cf2b4b4c2f30f674578c0df9 Mon Sep 17 00:00:00 2001 +From 2cee4c3ee3278cbdfbb39234f3c198f8c8f00688 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/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 77b5898b..8c6fa46e 100644 +index 36bab78d5..d73ea2297 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1329,6 +1329,7 @@ public final class CraftServer implements Server { +@@ -1311,6 +1311,7 @@ public final class CraftServer implements Server { @Deprecated public OfflinePlayer getOfflinePlayer(String name) { Validate.notNull(name, "Name cannot be null"); diff --git a/CraftBukkit-Patches/0077-Fix-Player-Banning.patch b/CraftBukkit-Patches/0077-Fix-Player-Banning.patch index 514acccb..fde7e281 100644 --- a/CraftBukkit-Patches/0077-Fix-Player-Banning.patch +++ b/CraftBukkit-Patches/0077-Fix-Player-Banning.patch @@ -1,4 +1,4 @@ -From 40ebcb075be2b9a4eb9a89a0397de4e8c6fae991 Mon Sep 17 00:00:00 2001 +From aaecd4f90772527559bff8f2eeb412d7d47c7fe7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Apr 2014 10:32:48 +1000 Subject: [PATCH] Fix Player Banning @@ -6,7 +6,7 @@ Subject: [PATCH] Fix Player Banning This issue stems from the fact that Bukkit's API only allows a UUID to be banned, but Minecraft requires both a UUID and name. To fix this we modify the code to require a UUID or a name, or both. The correct fix would be expanding the API to be able to provide a name, however this would require plugin changes. diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java -index 634d4f72..fa195fe5 100644 +index 634d4f721..fa195fe56 100644 --- a/src/main/java/net/minecraft/server/GameProfileBanEntry.java +++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java @@ -36,20 +36,29 @@ public class GameProfileBanEntry extends ExpirableListEntry { diff --git a/CraftBukkit-Patches/0078-Fix-ban-expire-dates.patch b/CraftBukkit-Patches/0078-Fix-ban-expire-dates.patch index fcda1f04..2d72e28f 100644 --- a/CraftBukkit-Patches/0078-Fix-ban-expire-dates.patch +++ b/CraftBukkit-Patches/0078-Fix-ban-expire-dates.patch @@ -1,11 +1,11 @@ -From 6e456005be80c4a552ec1ea35e8d1b914b239d0d Mon Sep 17 00:00:00 2001 +From c634e7981794f26f99ccd393f114d92ff9ac0286 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/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java -index fa195fe5..cb47697a 100644 +index fa195fe56..cb47697a0 100644 --- a/src/main/java/net/minecraft/server/GameProfileBanEntry.java +++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java @@ -14,7 +14,7 @@ public class GameProfileBanEntry extends ExpirableListEntry { diff --git a/CraftBukkit-Patches/0079-Correct-Ban-Expiration.patch b/CraftBukkit-Patches/0079-Correct-Ban-Expiration.patch index cd766042..b1b2a1ff 100644 --- a/CraftBukkit-Patches/0079-Correct-Ban-Expiration.patch +++ b/CraftBukkit-Patches/0079-Correct-Ban-Expiration.patch @@ -1,11 +1,11 @@ -From 9341788e3c6fa814c30e8db13d331beeb5574bca Mon Sep 17 00:00:00 2001 +From 1a7fc139e2650ac8685a158d0f76e30a26bace1c 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 bbb8a06e..1879f683 100644 +index 9d0e29df7..eda574b2d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -490,7 +490,7 @@ public abstract class PlayerList { diff --git a/CraftBukkit-Patches/0080-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0080-Log-null-TileEntity-Owner.patch index f55a30b0..3b6e2d4a 100644 --- a/CraftBukkit-Patches/0080-Log-null-TileEntity-Owner.patch +++ b/CraftBukkit-Patches/0080-Log-null-TileEntity-Owner.patch @@ -1,11 +1,11 @@ -From 18e532447c5ed2ffde5d887952dd4cc2f60ea610 Mon Sep 17 00:00:00 2001 +From 8ae72761feafbde621eae079e8ad17bef7c6a8cc 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 4fec7740..093e7eb7 100644 +index 331029284..8a0453245 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -172,7 +172,14 @@ public abstract class TileEntity { diff --git a/CraftBukkit-Patches/0081-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0081-Convert-player-skulls-async.patch index 67a58ae9..92f83f13 100644 --- a/CraftBukkit-Patches/0081-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0081-Convert-player-skulls-async.patch @@ -1,11 +1,11 @@ -From 3b1501f34a8b49534c85b17d52ea824ef827e29e Mon Sep 17 00:00:00 2001 +From c529f59e2e7b11954214087d88d06d22967aee9f 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/src/main/java/net/minecraft/server/ItemSkullPlayer.java b/src/main/java/net/minecraft/server/ItemSkullPlayer.java -index 28916b0e..a21ec22a 100644 +index 28916b0e3..a21ec22a9 100644 --- a/src/main/java/net/minecraft/server/ItemSkullPlayer.java +++ b/src/main/java/net/minecraft/server/ItemSkullPlayer.java @@ -38,8 +38,16 @@ public class ItemSkullPlayer extends ItemBlockWallable { @@ -28,7 +28,7 @@ index 28916b0e..a21ec22a 100644 } else { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index c6f69153..db4967f2 100644 +index cc86aae35..af5e4093c 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -7,6 +7,23 @@ import com.mojang.authlib.properties.Property; @@ -203,7 +203,7 @@ index c6f69153..db4967f2 100644 // CraftBukkit start public static void a(IBlockAccess iblockaccess, BlockPosition blockposition) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index e3951103..4cfc70aa 100644 +index e39511038..4cfc70aa7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -77,7 +77,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { diff --git a/CraftBukkit-Patches/0082-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0082-Prevent-NoClassDefError-crash-and-notify-on-crash.patch index 3c331148..e8326454 100644 --- a/CraftBukkit-Patches/0082-Prevent-NoClassDefError-crash-and-notify-on-crash.patch +++ b/CraftBukkit-Patches/0082-Prevent-NoClassDefError-crash-and-notify-on-crash.patch @@ -1,11 +1,11 @@ -From 8be2c3cd92c216c462ff2b71e319fdd8c83dd896 Mon Sep 17 00:00:00 2001 +From ec0988d648446c8670f7b56d06ef8ceb0253a7e0 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 Apr 2014 12:43:08 +0100 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d27a57b1..3f940be2 100644 +index 4223b219a..371e9ed7e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -129,6 +129,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -29,7 +29,7 @@ index d27a57b1..3f940be2 100644 CrashReport crashreport = CrashReport.a(throwable, "Exception while updating neighbours"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Block being updated"); diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index de08ad67..94a3d423 100644 +index de08ad67f..94a3d4237 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -60,6 +60,13 @@ public class WatchdogThread extends Thread diff --git a/CraftBukkit-Patches/0083-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0083-Fix-race-condition-that-could-kill-connections-befor.patch index c02da7df..d9f134c0 100644 --- a/CraftBukkit-Patches/0083-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0083-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From a2eccc05bc1b8d6ca267f3ee5cb949a35bc34006 Mon Sep 17 00:00:00 2001 +From ffc7b80a238080ed734994381dab1d06efc5944a 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 @@ -12,7 +12,7 @@ initialized. The ServerConnection does not remove NetworkManagers with this flag. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index c7f55041..79c24d2c 100644 +index 88aad6d43..d9d3d7714 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -51,6 +51,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -44,7 +44,7 @@ index c7f55041..79c24d2c 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 440bb0c8..be8d07f4 100644 +index 440bb0c8b..be8d07f41 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -136,6 +136,10 @@ public class ServerConnection { diff --git a/CraftBukkit-Patches/0084-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0084-Configurable-UserCache-cap.patch index 287215a5..68f9bf6e 100644 --- a/CraftBukkit-Patches/0084-Configurable-UserCache-cap.patch +++ b/CraftBukkit-Patches/0084-Configurable-UserCache-cap.patch @@ -1,11 +1,11 @@ -From 4fb2f3b8fb3f670968d628c355ea532b137934ce Mon Sep 17 00:00:00 2001 +From 86081e9e122f69a9de616e7a21d4e9d5948a339e 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 674243c4..7fb450d5 100644 +index 674243c49..7fb450d53 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -217,7 +217,7 @@ public class UserCache { @@ -18,7 +18,7 @@ index 674243c4..7fb450d5 100644 try { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index e371c261..538cdeeb 100644 +index e371c261e..538cdeeb7 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -314,4 +314,10 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0085-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0085-Implement-PlayerSpawnLocationEvent.patch index 0bfd980a..3547a4e7 100644 --- a/CraftBukkit-Patches/0085-Implement-PlayerSpawnLocationEvent.patch +++ b/CraftBukkit-Patches/0085-Implement-PlayerSpawnLocationEvent.patch @@ -1,11 +1,11 @@ -From 60f22e9f17ec6a569a08e6f4df22c40eb785290e Mon Sep 17 00:00:00 2001 +From e226ad7b1d8af1d7ad19be74afa84019d354ffa7 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 1879f683..3b34dd17 100644 +index eda574b2d..19781d73a 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -40,6 +40,7 @@ import org.bukkit.event.player.PlayerQuitEvent; diff --git a/CraftBukkit-Patches/0086-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0086-Cap-Objective-Score-Length.patch index 1a2e46b6..a977e271 100644 --- a/CraftBukkit-Patches/0086-Cap-Objective-Score-Length.patch +++ b/CraftBukkit-Patches/0086-Cap-Objective-Score-Length.patch @@ -1,4 +1,4 @@ -From f19b9bde4a944b5bf5fc3954f9b28a83b5c2aeec Mon Sep 17 00:00:00 2001 +From 3da873f9b51c7d57c4759b657e5c516033772acf Mon Sep 17 00:00:00 2001 From: hauno Date: Tue, 6 May 2014 18:01:37 -0700 Subject: [PATCH] Cap Objective Score Length @@ -6,7 +6,7 @@ Subject: [PATCH] Cap Objective Score Length Adds a check for Score arguments that would crash the client diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java -index 822600fe..b70fd583 100644 +index 3f8f1754a..fbb3c23a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java @@ -95,6 +95,7 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective diff --git a/CraftBukkit-Patches/0087-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0087-Process-conversation-input-on-the-main-thread.-Fixes.patch index e7c44d11..7a5c618f 100644 --- a/CraftBukkit-Patches/0087-Process-conversation-input-on-the-main-thread.-Fixes.patch +++ b/CraftBukkit-Patches/0087-Process-conversation-input-on-the-main-thread.-Fixes.patch @@ -1,4 +1,4 @@ -From ef634ab89138d8e7f4f0b0f38bb0cf172fee4f5d Mon Sep 17 00:00:00 2001 +From af105489f0c6a4d5dada32fb65e9f7a0c6e1c1d1 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 c728e61c1..bee9cca94 100644 +index 862449c98..67164049f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1452,7 +1452,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0088-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0088-Configurable-save-on-stop-only-for-UserCache.patch index 77b54f2e..01cbd0cb 100644 --- a/CraftBukkit-Patches/0088-Configurable-save-on-stop-only-for-UserCache.patch +++ b/CraftBukkit-Patches/0088-Configurable-save-on-stop-only-for-UserCache.patch @@ -1,14 +1,14 @@ -From c2d31c8e51954b79f82bba87e7d902ef416cffa1 Mon Sep 17 00:00:00 2001 +From 02062ae54761d8416abb2c808c3e145c9cca4436 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 d13e9138..6705c0e0 100644 +index d644ea0f4..d85fab954 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -609,6 +609,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -648,6 +648,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati this.j.e(); } @@ -22,7 +22,7 @@ index d13e9138..6705c0e0 100644 public String getServerIp() { diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 7fb450d5..127bfda0 100644 +index 7fb450d53..127bfda05 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -132,7 +132,7 @@ public class UserCache { @@ -44,7 +44,7 @@ index 7fb450d5..127bfda0 100644 } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 538cdeeb..03af46ad 100644 +index 538cdeeb7..03af46ad0 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -320,4 +320,10 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0089-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0089-Cross-World-Entity-Teleportation.patch index b8550e67..5bde2a0f 100644 --- a/CraftBukkit-Patches/0089-Cross-World-Entity-Teleportation.patch +++ b/CraftBukkit-Patches/0089-Cross-World-Entity-Teleportation.patch @@ -1,4 +1,4 @@ -From 49e0cb0a6df874c1a18a461fd681a6b73d0ce857 Mon Sep 17 00:00:00 2001 +From 7a12ff1d5c39a3721873ad7c1f4d7f96975dcb51 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Cross World Entity Teleportation Use Entity.teleportTo for cross-world teleportation in CraftEntity. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d1ab252d..49e0ccdb 100644 +index 91d165746..eef88cea6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -297,7 +297,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/CraftBukkit-Patches/0090-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0090-Limit-block-placement-interaction-packets.patch index 373476c8..2e54b00e 100644 --- a/CraftBukkit-Patches/0090-Limit-block-placement-interaction-packets.patch +++ b/CraftBukkit-Patches/0090-Limit-block-placement-interaction-packets.patch @@ -1,4 +1,4 @@ -From 640ef5355dcf9f5f3bb82a2bdbcefedca64815fd Mon Sep 17 00:00:00 2001 +From 0a8e114cadd0308b75d6d4910c058c0674260729 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 @@ -42,7 +42,7 @@ index 3c5f81519..ced2336fe 100644 this.b = (EnumDirection) packetdataserializer.a(EnumDirection.class); this.c = (EnumHand) packetdataserializer.a(EnumHand.class); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bee9cca94..4e9cff1ae 100644 +index 67164049f..7a7da9c3c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1182,9 +1182,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0091-Better-item-validation.patch b/CraftBukkit-Patches/0091-Better-item-validation.patch index 33a2913a..950ec258 100644 --- a/CraftBukkit-Patches/0091-Better-item-validation.patch +++ b/CraftBukkit-Patches/0091-Better-item-validation.patch @@ -1,4 +1,4 @@ -From ab494f635ae1bcf8ed6f18fe0a4009cdc24b72bc Mon Sep 17 00:00:00 2001 +From fdfcd39df2821b2492a34f163e29eb7d230782c8 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/0092-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0092-Further-Seed-Customisation.patch index 30c4a78f..562d275a 100644 --- a/CraftBukkit-Patches/0092-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0092-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From 973e5eb863be41bd87eb054a793471296dd9bfbb Mon Sep 17 00:00:00 2001 +From f13294bf6ce2ef9053c46e9bded6bc3f3a6d612b Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation @@ -6,7 +6,7 @@ Subject: [PATCH] Further Seed Customisation Allow server admins that really want to to customise the seeds used in world generation even further. diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java -index 957af9b3..002993b5 100644 +index 957af9b3f..002993b5e 100644 --- a/src/main/java/net/minecraft/server/ChunkGenerator.java +++ b/src/main/java/net/minecraft/server/ChunkGenerator.java @@ -40,4 +40,6 @@ public interface ChunkGenerator { @@ -17,7 +17,7 @@ index 957af9b3..002993b5 100644 + World getWorld(); // Spigot } diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java -index a0362c3f..79f1a602 100644 +index a0362c3f8..79f1a6024 100644 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -156,4 +156,11 @@ public abstract class ChunkGeneratorAbstract implem @@ -33,7 +33,7 @@ index a0362c3f..79f1a602 100644 + // Spigot end } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 772a2eaf..3167c3f5 100644 +index 590cd057f..31e066b54 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -252,7 +252,7 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -46,7 +46,7 @@ index 772a2eaf..3167c3f5 100644 if (this.random.nextInt(10) == 0 && flag && this.locY < 40.0D) { return super.a(generatoraccess); diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java -index fb5ac05d..889b2fc6 100644 +index fb5ac05d5..889b2fc66 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java @@ -18,8 +18,10 @@ public class WorldGenFeatureDesertPyramid extends WorldGenFeatureRandomScattered @@ -63,7 +63,7 @@ index fb5ac05d..889b2fc6 100644 public static class a extends StructureStart { diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java -index e6cc8f01..22c31dcb 100644 +index e6cc8f011..22c31dcb0 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java @@ -18,8 +18,10 @@ public class WorldGenFeatureIgloo extends WorldGenFeatureRandomScattered chunkgenerator) { diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java -index 887293c3..0f132259 100644 +index 887293c3c..0f1322590 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java @@ -23,8 +23,10 @@ public class WorldGenFeatureSwampHut extends WorldGenFeatureRandomScattered d() { diff --git a/src/main/java/net/minecraft/server/WorldGenMonument.java b/src/main/java/net/minecraft/server/WorldGenMonument.java -index 57afb480..307da2a6 100644 +index 57afb4809..307da2a6d 100644 --- a/src/main/java/net/minecraft/server/WorldGenMonument.java +++ b/src/main/java/net/minecraft/server/WorldGenMonument.java @@ -23,7 +23,7 @@ public class WorldGenMonument extends StructureGenerator Date: Sat, 5 Jul 2014 16:56:44 +0100 Subject: [PATCH] Add More Information to session.lock Errors diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 0e0ebd40..a5157269 100644 +index 0e0ebd403..a5157269c 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -62,7 +62,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { diff --git a/CraftBukkit-Patches/0094-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0094-Safer-JSON-Loading.patch index b3070bd6..5594e55a 100644 --- a/CraftBukkit-Patches/0094-Safer-JSON-Loading.patch +++ b/CraftBukkit-Patches/0094-Safer-JSON-Loading.patch @@ -1,11 +1,11 @@ -From 8422206af6226e160012c3c989207b04ecb08d97 Mon Sep 17 00:00:00 2001 +From 4441d946a2caf1a01b1ce903e2e21d95900fad26 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 8 Jul 2014 09:44:18 +1000 Subject: [PATCH] Safer JSON Loading diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 63338e38..6700e68c 100644 +index 63338e38c..6700e68c0 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -190,6 +190,14 @@ public class JsonList> { @@ -24,7 +24,7 @@ index 63338e38..6700e68c 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 127bfda0..0e168ad3 100644 +index 127bfda05..0e168ad34 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -208,6 +208,11 @@ public class UserCache { diff --git a/CraftBukkit-Patches/0095-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0095-Add-CommandLine-EULA-Flag.patch index f462f5ff..32d95a87 100644 --- a/CraftBukkit-Patches/0095-Add-CommandLine-EULA-Flag.patch +++ b/CraftBukkit-Patches/0095-Add-CommandLine-EULA-Flag.patch @@ -1,4 +1,4 @@ -From acc3d4212beff615071097660139267d938c7c8b Mon Sep 17 00:00:00 2001 +From 03efd3355827c84b824b70a986aff00d50ea332b 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,7 +8,7 @@ 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 6283fce5..8563712d 100644 +index 5dd323b12..5ff1e9686 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -136,7 +136,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/CraftBukkit-Patches/0096-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0096-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch index 99e51c5a..c62952e5 100644 --- a/CraftBukkit-Patches/0096-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch +++ b/CraftBukkit-Patches/0096-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch @@ -1,4 +1,4 @@ -From 2c7c48c6a1c7a5fe0863075fde000f4eb03e58cf Mon Sep 17 00:00:00 2001 +From db91fcdd426addeb03a60e04674cb959eccf9bd6 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java -index e71a7bff..f97b634f 100644 +index ef9c7b296..5dce765b2 100644 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java @@ -369,7 +369,11 @@ public class ContainerEnchantTable extends Container { diff --git a/CraftBukkit-Patches/0097-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0097-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 1bcf3fb2..22157863 100644 --- a/CraftBukkit-Patches/0097-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0097-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,11 +1,11 @@ -From 09af937e5ecd2cfd298b7c24f0fecb3f983a376d Mon Sep 17 00:00:00 2001 +From 2cb18ab5e022d854ed3bba6ecc29f71231bb3893 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/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 806ab978..6ea276aa 100644 +index 5515a30b7..4e132eabb 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -10,6 +10,7 @@ public class EntityOcelot extends EntityTameableAnimal { @@ -26,7 +26,7 @@ index 806ab978..6ea276aa 100644 EntityOcelot entityocelot = new EntityOcelot(this.world); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a5dd3934..0b2a9d09 100644 +index a5dd39348..0b2a9d09d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1211,6 +1211,12 @@ public class CraftWorld implements World { diff --git a/CraftBukkit-Patches/0098-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0098-Prevent-a-crash-involving-attributes.patch index 5553f3d0..5bab6b0a 100644 --- a/CraftBukkit-Patches/0098-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0098-Prevent-a-crash-involving-attributes.patch @@ -1,11 +1,11 @@ -From 175f59173dacc75d3d05eb44680e01b60383bbfa Mon Sep 17 00:00:00 2001 +From d557c7dbc97ead129a9d643b0c7fd074b010b984 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 19:54:41 +0100 Subject: [PATCH] Prevent a crash involving attributes diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4aa50915..d423b8c7 100644 +index 4aa50915a..d423b8c76 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1455,7 +1455,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0099-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0099-Make-moved-wrongly-limit-configurable.patch index 0786d126..7529efd7 100644 --- a/CraftBukkit-Patches/0099-Make-moved-wrongly-limit-configurable.patch +++ b/CraftBukkit-Patches/0099-Make-moved-wrongly-limit-configurable.patch @@ -1,11 +1,11 @@ -From f026bb0690c87ed87f1fb58cc64a8411e34ab5fe Mon Sep 17 00:00:00 2001 +From d3c5ad3d0cf0a82e02fbb39d9ffa596aa52d9c43 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 4e9cff1ae..7cb939af5 100644 +index 7a7da9c3c..5c42b289a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -351,7 +351,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0100-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0100-Fix-Null-Tile-Entity-Worlds.patch index 955b6e73..84450403 100644 --- a/CraftBukkit-Patches/0100-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0100-Fix-Null-Tile-Entity-Worlds.patch @@ -1,14 +1,14 @@ -From 8a3b70d5b773aada97f62c367ffb424da3a3e258 Mon Sep 17 00:00:00 2001 +From 7f13ffa682dd4e9c4930f327381746c7abd163f0 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3f940be2..080816dd 100644 +index 371e9ed7e..9320d88c1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1709,6 +1709,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose +@@ -1713,6 +1713,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose } } diff --git a/CraftBukkit-Patches/0101-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0101-Make-moved-too-quickly-limit-configurable.patch index 35517973..7c5e869e 100644 --- a/CraftBukkit-Patches/0101-Make-moved-too-quickly-limit-configurable.patch +++ b/CraftBukkit-Patches/0101-Make-moved-too-quickly-limit-configurable.patch @@ -1,11 +1,11 @@ -From 100f403abc43c1103b5bc9c5f0a3ae884bc6ef04 Mon Sep 17 00:00:00 2001 +From b5898b3a7793dea8e462ed087d1ee37eac669dac 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 7cb939af5..088734f35 100644 +index 5c42b289a..06b98d515 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -326,7 +326,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -18,8 +18,8 @@ index 7cb939af5..088734f35 100644 PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), Double.valueOf(d6), Double.valueOf(d7), Double.valueOf(d8)); this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity)); @@ -845,7 +845,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { - if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean("disableElytraMovementCheck") || !this.player.db())) { - float f2 = this.player.db() ? 300.0F : 100.0F; + if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean("disableElytraMovementCheck") || !this.player.dc())) { + float f2 = this.player.dc() ? 300.0F : 100.0F; - if (d11 - d10 > Math.max(f2, Math.pow((double) (10.0F * (float) i * speed), 2)) && (!this.minecraftServer.J() || !this.minecraftServer.I().equals(this.player.getProfile().getName()))) { + if (d11 - d10 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && (!this.minecraftServer.J() || !this.minecraftServer.I().equals(this.player.getProfile().getName()))) { diff --git a/CraftBukkit-Patches/0102-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0102-Apply-NBTReadLimiter-to-more-things.patch index 9766ae46..e205b86e 100644 --- a/CraftBukkit-Patches/0102-Apply-NBTReadLimiter-to-more-things.patch +++ b/CraftBukkit-Patches/0102-Apply-NBTReadLimiter-to-more-things.patch @@ -1,11 +1,11 @@ -From 34f53f8c8a3562274f21657793c6501f37f91eea Mon Sep 17 00:00:00 2001 +From 115212f11d3920be10a28547401e88787f206a53 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/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java -index 345d763d..2162d3ad 100644 +index 345d763d9..2162d3ad3 100644 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java @@ -44,6 +44,12 @@ public class NBTCompressedStreamTools { @@ -23,7 +23,7 @@ index 345d763d..2162d3ad 100644 if (nbtbase instanceof NBTTagCompound) { diff --git a/src/main/java/org/spigotmc/LimitStream.java b/src/main/java/org/spigotmc/LimitStream.java new file mode 100644 -index 00000000..8c32e8b6 +index 000000000..8c32e8b62 --- /dev/null +++ b/src/main/java/org/spigotmc/LimitStream.java @@ -0,0 +1,39 @@ diff --git a/CraftBukkit-Patches/0103-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0103-Allow-Attribute-Capping.patch index e11f3e5a..47b405ab 100644 --- a/CraftBukkit-Patches/0103-Allow-Attribute-Capping.patch +++ b/CraftBukkit-Patches/0103-Allow-Attribute-Capping.patch @@ -1,4 +1,4 @@ -From edc3a6427ad69351df783b600dffaa788c49f2f2 Mon Sep 17 00:00:00 2001 +From eb6aa7dc03179574e0522f4e3204545ab65567b8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 28 Jul 2014 16:55:51 +1000 Subject: [PATCH] Allow Attribute Capping. @@ -6,20 +6,20 @@ Subject: [PATCH] Allow Attribute Capping. Apply some sensible defaults and allow server owners to customize the maximum values of selected common attributes. diff --git a/src/main/java/net/minecraft/server/AttributeRanged.java b/src/main/java/net/minecraft/server/AttributeRanged.java -index 130597c6..d012c90d 100644 +index 8cbde48f0..02dea695c 100644 --- a/src/main/java/net/minecraft/server/AttributeRanged.java +++ b/src/main/java/net/minecraft/server/AttributeRanged.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; public class AttributeRanged extends AttributeBase { private final double a; -- private final double b; -+ public double b; // Spigot +- public final double maximum; ++ public double maximum; // Spigot private String c; public AttributeRanged(@Nullable IAttribute iattribute, String s, double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java -index 1a7e20d6..a3f89696 100644 +index 1a7e20d6f..a3f896963 100644 --- a/src/main/java/net/minecraft/server/GenericAttributes.java +++ b/src/main/java/net/minecraft/server/GenericAttributes.java @@ -10,16 +10,18 @@ import org.apache.logging.log4j.Logger; @@ -45,7 +45,7 @@ index 1a7e20d6..a3f89696 100644 public static NBTTagList a(AttributeMapBase attributemapbase) { NBTTagList nbttaglist = new NBTTagList(); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 37d9dadb..9ec61e45 100644 +index 37d9dadbc..d15a66d12 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -14,6 +14,8 @@ import java.util.Map; @@ -68,11 +68,11 @@ index 37d9dadb..9ec61e45 100644 + private static void attributeMaxes() + { + maxHealth = getDouble( "settings.attribute.maxHealth.max", maxHealth ); -+ ( (AttributeRanged) GenericAttributes.maxHealth ).b = maxHealth; ++ ( (AttributeRanged) GenericAttributes.maxHealth ).maximum = maxHealth; + movementSpeed = getDouble( "settings.attribute.movementSpeed.max", movementSpeed ); -+ ( (AttributeRanged) GenericAttributes.MOVEMENT_SPEED ).b = movementSpeed; ++ ( (AttributeRanged) GenericAttributes.MOVEMENT_SPEED ).maximum = movementSpeed; + attackDamage = getDouble( "settings.attribute.attackDamage.max", attackDamage ); -+ ( (AttributeRanged) GenericAttributes.ATTACK_DAMAGE ).b = attackDamage; ++ ( (AttributeRanged) GenericAttributes.ATTACK_DAMAGE ).maximum = attackDamage; + } } -- diff --git a/CraftBukkit-Patches/0104-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0104-Only-fetch-an-online-UUID-in-online-mode.patch index 4c2dbc0e..839a57ab 100644 --- a/CraftBukkit-Patches/0104-Only-fetch-an-online-UUID-in-online-mode.patch +++ b/CraftBukkit-Patches/0104-Only-fetch-an-online-UUID-in-online-mode.patch @@ -1,4 +1,4 @@ -From af73c3f48c1dd307a38be3ba52ee48f2a861edcc Mon Sep 17 00:00:00 2001 +From d553e016496a402123a0dfa8bf603803a49cd475 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 @@ -12,10 +12,10 @@ You want to store data for player "Test" who never joined. An online UUID is cr The player Test joins with an offline UUID but that will not match the online UUID of the saved data. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8c6fa46e..dcdcf8c8 100644 +index d73ea2297..5673a9858 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1333,8 +1333,14 @@ public final class CraftServer implements Server { +@@ -1315,8 +1315,14 @@ public final class CraftServer implements Server { OfflinePlayer result = getPlayerExact(name); if (result == null) { diff --git a/CraftBukkit-Patches/0105-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0105-Filter-attribute-modifiers-which-cause-the-attribute.patch index c29170c2..f44b5cf3 100644 --- a/CraftBukkit-Patches/0105-Filter-attribute-modifiers-which-cause-the-attribute.patch +++ b/CraftBukkit-Patches/0105-Filter-attribute-modifiers-which-cause-the-attribute.patch @@ -1,4 +1,4 @@ -From 50acf78224a4c4c18d73c684b0f2d460e9a738e1 Mon Sep 17 00:00:00 2001 +From 0dba71b1d82a28cfb789bec9588a79fd90ff305f 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/0106-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0106-Plug-WorldMap-Memory-Leak.patch index 951e1caf..5d34abfa 100644 --- a/CraftBukkit-Patches/0106-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0106-Plug-WorldMap-Memory-Leak.patch @@ -1,11 +1,11 @@ -From ab111d064defdbe18c84a051de9936ddaf9676a5 Mon Sep 17 00:00:00 2001 +From 3f54d8c7e9f913bb82e80ca110aa5b91b11c7665 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/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java -index 54550602..0ffca430 100644 +index 855192af3..6b5600ba5 100644 --- a/src/main/java/net/minecraft/server/PersistentCollection.java +++ b/src/main/java/net/minecraft/server/PersistentCollection.java @@ -29,7 +29,7 @@ public class PersistentCollection { @@ -18,7 +18,7 @@ index 54550602..0ffca430 100644 public PersistentCollection(IDataManager idatamanager) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 080816dd..4bb2dff7 100644 +index 9320d88c1..dfcafc6d4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -979,6 +979,23 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -46,7 +46,7 @@ index 080816dd..4bb2dff7 100644 this.c(entity); } diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java -index 51fa1b1b..445a016b 100644 +index 51fa1b1b9..445a016b7 100644 --- a/src/main/java/net/minecraft/server/WorldMap.java +++ b/src/main/java/net/minecraft/server/WorldMap.java @@ -26,7 +26,7 @@ public class WorldMap extends PersistentBase { diff --git a/CraftBukkit-Patches/0107-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0107-Fix-Corrupted-Trapped-Chest.patch index 8d9b219a..1bc12fe3 100644 --- a/CraftBukkit-Patches/0107-Fix-Corrupted-Trapped-Chest.patch +++ b/CraftBukkit-Patches/0107-Fix-Corrupted-Trapped-Chest.patch @@ -1,4 +1,4 @@ -From cfd53dfea10358bf24d21d339a2bba0250592b9b Mon Sep 17 00:00:00 2001 +From 868bdbc0d65ae2615eef32046920c6d6adee1207 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Aug 2014 00:56:41 -0400 Subject: [PATCH] Fix Corrupted Trapped Chest @@ -9,7 +9,7 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever This will now fix Trapped Chests too. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0da706b5..235f0856 100644 +index bd949a1ec..e91ea4890 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -143,7 +143,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0108-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0108-Remove-uneeded-validation.patch index a8de6595..4288912e 100644 --- a/CraftBukkit-Patches/0108-Remove-uneeded-validation.patch +++ b/CraftBukkit-Patches/0108-Remove-uneeded-validation.patch @@ -1,4 +1,4 @@ -From ac871fd9b9b838ce1c07b2344fbe49b0889081c2 Mon Sep 17 00:00:00 2001 +From 947b2deb410d5d966243776626435e0e55b0d0ad Mon Sep 17 00:00:00 2001 From: drXor Date: Fri, 15 Aug 2014 18:11:09 -0400 Subject: [PATCH] Remove uneeded validation diff --git a/CraftBukkit-Patches/0109-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0109-Add-Hunger-Config-Values.patch index 54b88883..15c28db8 100644 --- a/CraftBukkit-Patches/0109-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0109-Add-Hunger-Config-Values.patch @@ -1,11 +1,11 @@ -From a25132e0b9fc006be85b27437169faf044531d78 Mon Sep 17 00:00:00 2001 +From 081daae07e86047bcf2dfd0ccad241ac5d432be2 Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 45e1ffc6..40efd6c6 100644 +index 71f4cb47a..fc64ba3c9 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1166,7 +1166,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -18,7 +18,7 @@ index 45e1ffc6..40efd6c6 100644 this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_PLAYER_ATTACK_NODAMAGE, this.bV(), 1.0F, 1.0F); if (flag4) { @@ -1455,9 +1455,9 @@ public abstract class EntityHuman extends EntityLiving { - super.cG(); + super.cH(); this.a(StatisticList.JUMP); if (this.isSprinting()) { - this.applyExhaustion(0.2F); @@ -61,9 +61,9 @@ index 45e1ffc6..40efd6c6 100644 + this.applyExhaustion(world.spigotConfig.otherMultiplier * (float) i * 0.01F); // Spigot } } - } else if (this.db()) { + } else if (this.dc()) { diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index cf731ae8..bbcc488b 100644 +index 18361a996..03dbd21ee 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -73,7 +73,7 @@ public class FoodMetaData { @@ -76,7 +76,7 @@ index cf731ae8..bbcc488b 100644 } } else if (this.foodLevel <= 0) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index d8d5877a..585a70b6 100644 +index d8d5877a8..585a70b6a 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -254,4 +254,30 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0110-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0110-Make-debug-logging-togglable.patch index 060ac0c0..8ca6f545 100644 --- a/CraftBukkit-Patches/0110-Make-debug-logging-togglable.patch +++ b/CraftBukkit-Patches/0110-Make-debug-logging-togglable.patch @@ -1,11 +1,11 @@ -From 53a66f37794c4a6184b70bdca34dfded83b11061 Mon Sep 17 00:00:00 2001 +From c922f77dd02791cdf85c8da0eb5d420151972d46 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/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 9ec61e45..7b8d9c23 100644 +index d15a66d12..f615a8231 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -19,6 +19,9 @@ import net.minecraft.server.GenericAttributes; @@ -20,7 +20,7 @@ index 9ec61e45..7b8d9c23 100644 import org.bukkit.command.Command; @@ -353,4 +356,27 @@ public class SpigotConfig attackDamage = getDouble( "settings.attribute.attackDamage.max", attackDamage ); - ( (AttributeRanged) GenericAttributes.ATTACK_DAMAGE ).b = attackDamage; + ( (AttributeRanged) GenericAttributes.ATTACK_DAMAGE ).maximum = attackDamage; } + + public static boolean debug; @@ -47,7 +47,7 @@ index 9ec61e45..7b8d9c23 100644 + } } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 4a5ca1eb..5cee8f00 100644 +index 4a5ca1ebd..5cee8f00e 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -19,9 +19,9 @@ diff --git a/CraftBukkit-Patches/0111-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0111-Limit-TNT-Detonations-per-tick.patch index 1607a615..d4b16052 100644 --- a/CraftBukkit-Patches/0111-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0111-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From 177a9b7ce28cf8a25a26302d2f03565c5143cca3 Mon Sep 17 00:00:00 2001 +From 477e46a0faaa4929e829953010136bfb18fbfc71 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 @@ -7,7 +7,7 @@ This gives a per-world control on how much TNT will be processed per-tick, preventing a massive TNT detonation from lagging out the server. diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index aa4c31bb..7edc0285 100644 +index aa4c31bb7..7edc02852 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -48,6 +48,7 @@ public class EntityTNTPrimed extends Entity { @@ -19,7 +19,7 @@ index aa4c31bb..7edc0285 100644 this.lastY = this.locY; this.lastZ = this.locZ; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 235f0856..b8fed305 100644 +index e91ea4890..c605e2c97 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -598,6 +598,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -31,7 +31,7 @@ index 235f0856..b8fed305 100644 protected void p_() { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 585a70b6..9e38d183 100644 +index 585a70b6a..9e38d183f 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -280,4 +280,15 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0112-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0112-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch index e5147d25..f822b2ef 100644 --- a/CraftBukkit-Patches/0112-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch +++ b/CraftBukkit-Patches/0112-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From c0cc3afab8c8ce18951782d389d051d7584b0247 Mon Sep 17 00:00:00 2001 +From 6f77da20222b669e9e96e18ebee4e18275ddc108 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 22 Aug 2014 05:35:16 -0400 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta diff --git a/CraftBukkit-Patches/0113-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0113-Configurable-Hanging-Tick.patch index dc29578c..ea362b2b 100644 --- a/CraftBukkit-Patches/0113-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0113-Configurable-Hanging-Tick.patch @@ -1,11 +1,11 @@ -From fb5a2fefa7085fb66e232d038ddebe640881d757 Mon Sep 17 00:00:00 2001 +From 9ed5cbe8f1faba656de5bcaf3de4fd3377c9c68d 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/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java -index 09ce38a6..be42e6e6 100644 +index 09ce38a67..be42e6e67 100644 --- a/src/main/java/net/minecraft/server/EntityHanging.java +++ b/src/main/java/net/minecraft/server/EntityHanging.java @@ -94,7 +94,7 @@ public abstract class EntityHanging extends Entity { @@ -18,7 +18,7 @@ index 09ce38a6..be42e6e6 100644 if (!this.dead && !this.survives()) { // CraftBukkit start - fire break events diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 9e38d183..49e70a7c 100644 +index 9e38d183f..49e70a7c1 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -291,4 +291,10 @@ public class SpigotWorldConfig diff --git a/CraftBukkit-Patches/0114-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0114-BungeeCord-Chat-API.patch index b1b98be4..3fdb9185 100644 --- a/CraftBukkit-Patches/0114-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0114-BungeeCord-Chat-API.patch @@ -1,11 +1,11 @@ -From 5211059a95ab4ee44e3c865bb2dec6c21873eafc Mon Sep 17 00:00:00 2001 +From dfa2d9e28610a1d8a2e1ffddcab1993f33ef270c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 03:06:05 +0100 Subject: [PATCH] BungeeCord Chat API diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index e55384e7..28a26283 100644 +index e55384e70..28a262835 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -5,6 +5,7 @@ import java.io.IOException; @@ -32,7 +32,7 @@ index e55384e7..28a26283 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dcdcf8c8..ce5ebcc5 100644 +index 5673a9858..4dc0c8fcb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -149,6 +149,7 @@ import org.bukkit.craftbukkit.tag.CraftBlockTag; @@ -43,7 +43,7 @@ index dcdcf8c8..ce5ebcc5 100644 public final class CraftServer implements Server { private final String serverName = "CraftBukkit"; -@@ -1859,6 +1860,20 @@ public final class CraftServer implements Server { +@@ -1841,6 +1842,20 @@ public final class CraftServer implements Server { public void restart() { org.spigotmc.RestartCommand.restart(); } @@ -65,7 +65,7 @@ index dcdcf8c8..ce5ebcc5 100644 public Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java -index c10a8445..5c3421dd 100644 +index c10a84452..5c3421dd3 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java @@ -81,6 +81,17 @@ public abstract class ServerCommandSender implements CommandSender { @@ -87,7 +87,7 @@ index c10a8445..5c3421dd 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index eef88cea..72164e11 100644 +index eef88cea6..72164e11a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -753,6 +753,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -108,7 +108,7 @@ index eef88cea..72164e11 100644 public Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d423b8c7..0a2199b6 100644 +index d423b8c76..0a2199b6a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -23,6 +23,7 @@ import java.util.UUID; @@ -159,7 +159,7 @@ index d423b8c7..0a2199b6 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index 600538b1..6ff1a2dc 100644 +index 600538b11..6ff1a2dcd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -25,6 +25,9 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; diff --git a/CraftBukkit-Patches/0115-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0115-Allow-Capping-Tile-Entity-Tick-Time.patch index 53c2bf28..048125bc 100644 --- a/CraftBukkit-Patches/0115-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0115-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 3cc6518fbf4d5a5cd88301b0f4a8b61acbf1c045 Mon Sep 17 00:00:00 2001 +From 65a6bce57cb870c980fc8add3f6b63e0e6fbbcbc Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:39:31 +1100 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time. @@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based This feature was commisioned by Chunkr. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4bb2dff7..c7f5cba2 100644 +index dfcafc6d4..13c404337 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -131,6 +131,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -82,7 +82,7 @@ index 4bb2dff7..c7f5cba2 100644 if (this.isLoaded(tileentity.getPosition())) { this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition()); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 49e70a7c..e146308b 100644 +index 49e70a7c1..e146308ba 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -297,4 +297,13 @@ public class SpigotWorldConfig @@ -101,7 +101,7 @@ index 49e70a7c..e146308b 100644 } diff --git a/src/main/java/org/spigotmc/TickLimiter.java b/src/main/java/org/spigotmc/TickLimiter.java new file mode 100644 -index 00000000..23a39382 +index 000000000..23a39382b --- /dev/null +++ b/src/main/java/org/spigotmc/TickLimiter.java @@ -0,0 +1,20 @@ diff --git a/CraftBukkit-Patches/0116-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0116-Use-Standard-List-for-EntitySlices.patch index 8a55637f..cc587cc7 100644 --- a/CraftBukkit-Patches/0116-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0116-Use-Standard-List-for-EntitySlices.patch @@ -1,11 +1,11 @@ -From 85d2a2f16d28332881dd544fe9a1c1f0508b4c4e Mon Sep 17 00:00:00 2001 +From 2c2cd33599dad0d0c745f3952c82734c7375897a 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/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index e54b84ba..9500c456 100644 +index d5aaf872a..af0426b24 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -41,7 +41,7 @@ public class Chunk implements IChunkAccess { @@ -83,7 +83,7 @@ index e54b84ba..9500c456 100644 } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 635653ab..e60fe5a9 100644 +index 635653abc..e60fe5a92 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -1,5 +1,6 @@ diff --git a/CraftBukkit-Patches/0117-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0117-Use-FastMatches-for-ItemStack-Dirty-Check.patch index 7b6c1de9..3602652f 100644 --- a/CraftBukkit-Patches/0117-Use-FastMatches-for-ItemStack-Dirty-Check.patch +++ b/CraftBukkit-Patches/0117-Use-FastMatches-for-ItemStack-Dirty-Check.patch @@ -1,4 +1,4 @@ -From 8ba892c9c20d6fedd92f73e06e89910a14cb5608 Mon Sep 17 00:00:00 2001 +From 35da8b9979a7ed561f705dba0161753ee872614c 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 @@ -58,7 +58,7 @@ index 8184ef0d9..3f0c5d7dd 100644 return itemstack.isEmpty() && itemstack1.isEmpty() ? true : (!itemstack.isEmpty() && !itemstack1.isEmpty() ? itemstack.c(itemstack1) : false); } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 7b8d9c23a..f3469d265 100644 +index f615a8231..ed697b216 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -379,4 +379,9 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0118-Use-Map-for-getPlayer-String-lookup.patch b/CraftBukkit-Patches/0118-Use-Map-for-getPlayer-String-lookup.patch index 1c0045ae..7178605a 100644 --- a/CraftBukkit-Patches/0118-Use-Map-for-getPlayer-String-lookup.patch +++ b/CraftBukkit-Patches/0118-Use-Map-for-getPlayer-String-lookup.patch @@ -1,11 +1,11 @@ -From a17f225d73a4b24c4e5a0f30f589c3fa4c5947bd Mon Sep 17 00:00:00 2001 +From 5c739260a0c1b57d57ad96dac4a6591634918ed2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 13 Jul 2015 19:05:15 +1000 Subject: [PATCH] Use Map for getPlayer(String) lookup. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3b34dd17..0156175f 100644 +index 19781d73a..e476d3433 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -72,6 +72,7 @@ public abstract class PlayerList { @@ -48,7 +48,7 @@ index 3b34dd17..0156175f 100644 this.j.put(entityplayer1.getUniqueID(), entityplayer1); } // entityplayer1.syncInventory(); -@@ -1154,19 +1159,7 @@ public abstract class PlayerList { +@@ -1147,19 +1152,7 @@ public abstract class PlayerList { @Nullable public EntityPlayer getPlayer(String s) { @@ -71,7 +71,7 @@ index 3b34dd17..0156175f 100644 public void sendPacketNearby(@Nullable EntityHuman entityhuman, double d0, double d1, double d2, double d3, int i, Packet packet) { diff --git a/src/main/java/org/spigotmc/CaseInsensitiveHashingStrategy.java b/src/main/java/org/spigotmc/CaseInsensitiveHashingStrategy.java new file mode 100644 -index 00000000..aafdd368 +index 000000000..aafdd3682 --- /dev/null +++ b/src/main/java/org/spigotmc/CaseInsensitiveHashingStrategy.java @@ -0,0 +1,18 @@ @@ -95,7 +95,7 @@ index 00000000..aafdd368 +} diff --git a/src/main/java/org/spigotmc/CaseInsensitiveMap.java b/src/main/java/org/spigotmc/CaseInsensitiveMap.java new file mode 100644 -index 00000000..1934fd50 +index 000000000..1934fd50a --- /dev/null +++ b/src/main/java/org/spigotmc/CaseInsensitiveMap.java @@ -0,0 +1,15 @@ diff --git a/CraftBukkit-Patches/0119-Clear-Packet-Queue-on-Disconnect.patch b/CraftBukkit-Patches/0119-Clear-Packet-Queue-on-Disconnect.patch index e16176b6..4cfd41bf 100644 --- a/CraftBukkit-Patches/0119-Clear-Packet-Queue-on-Disconnect.patch +++ b/CraftBukkit-Patches/0119-Clear-Packet-Queue-on-Disconnect.patch @@ -1,11 +1,11 @@ -From 1352bcd12265d431397eec9e5451448f675d3188 Mon Sep 17 00:00:00 2001 +From 3ea2501ea4c4b4f81f998006d5ed824a1751bc0a Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 22 Jul 2015 19:04:37 +1000 Subject: [PATCH] Clear Packet Queue on Disconnect diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 79c24d2cf..5b0d83a1d 100644 +index d9d3d7714..0afaea810 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -326,6 +326,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -17,7 +17,7 @@ index 79c24d2cf..5b0d83a1d 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 088734f35..2fb86aa19 100644 +index 06b98d515..2f2f4c6c6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1372,7 +1372,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/CraftBukkit-Patches/0120-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0120-Implement-SpawnerSpawnEvent.patch index 0515ab04..c4da07f7 100644 --- a/CraftBukkit-Patches/0120-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0120-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From d995321081d2bcb8930805ffa748c9946bf505ed Mon Sep 17 00:00:00 2001 +From 2e93f3152c84e09d8717c819e148f83447e1dee6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 3 Mar 2016 19:45:46 +1100 Subject: [PATCH] Implement SpawnerSpawnEvent. diff --git a/CraftBukkit-Patches/0121-Don-t-tick-blocks-if-neighbor-chunks-aren-t-loaded.patch b/CraftBukkit-Patches/0121-Don-t-tick-blocks-if-neighbor-chunks-aren-t-loaded.patch index 6d27eaba..9dcd1c76 100644 --- a/CraftBukkit-Patches/0121-Don-t-tick-blocks-if-neighbor-chunks-aren-t-loaded.patch +++ b/CraftBukkit-Patches/0121-Don-t-tick-blocks-if-neighbor-chunks-aren-t-loaded.patch @@ -1,11 +1,11 @@ -From 9a887ac2c571535ce031967a02569b14046a54c4 Mon Sep 17 00:00:00 2001 +From 16a7263b4bc4f35648b6690f69606d6f0236306c Mon Sep 17 00:00:00 2001 From: BlackHole Date: Fri, 22 Apr 2016 16:43:47 +0200 Subject: [PATCH] Don't tick blocks if neighbor chunks aren't loaded diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b8fed305..7f65b6da 100644 +index c605e2c97..2c6f6de4c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -485,6 +485,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/CraftBukkit-Patches/0122-Branchless-NibbleArray.patch b/CraftBukkit-Patches/0122-Branchless-NibbleArray.patch index 6134f69a..e1c14d52 100644 --- a/CraftBukkit-Patches/0122-Branchless-NibbleArray.patch +++ b/CraftBukkit-Patches/0122-Branchless-NibbleArray.patch @@ -1,11 +1,11 @@ -From 02bb9054ca2c20b257cb5e535082e1411ea652c2 Mon Sep 17 00:00:00 2001 +From 1625678e4d828420f63a945c0463a38aa20d9033 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 30 Jul 2016 11:29:14 +1000 Subject: [PATCH] Branchless NibbleArray diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java -index 1509c772..79c5bc42 100644 +index 1509c772e..79c5bc429 100644 --- a/src/main/java/net/minecraft/server/NibbleArray.java +++ b/src/main/java/net/minecraft/server/NibbleArray.java @@ -30,18 +30,16 @@ public class NibbleArray { @@ -34,7 +34,7 @@ index 1509c772..79c5bc42 100644 private boolean b(int i) { diff --git a/src/test/java/org/bukkit/NibbleArrayTest.java b/src/test/java/org/bukkit/NibbleArrayTest.java new file mode 100644 -index 00000000..0131ff04 +index 000000000..0131ff04a --- /dev/null +++ b/src/test/java/org/bukkit/NibbleArrayTest.java @@ -0,0 +1,29 @@ diff --git a/CraftBukkit-Patches/0123-Replace-chunk-loading-unloading-rate-throttling.patch b/CraftBukkit-Patches/0123-Replace-chunk-loading-unloading-rate-throttling.patch index 29d80853..3fa5ca80 100644 --- a/CraftBukkit-Patches/0123-Replace-chunk-loading-unloading-rate-throttling.patch +++ b/CraftBukkit-Patches/0123-Replace-chunk-loading-unloading-rate-throttling.patch @@ -1,4 +1,4 @@ -From 38934618563282527bd26844eb183030d509d553 Mon Sep 17 00:00:00 2001 +From b9e65990e2f057112dd633f18ef04f0ed2b72af0 Mon Sep 17 00:00:00 2001 From: Geoff Crossland Date: Thu, 26 Jan 2017 20:54:55 +0000 Subject: [PATCH] Replace chunk loading / unloading rate throttling. @@ -52,7 +52,7 @@ index 62925a0c7..d35203cc5 100644 this.f.a(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e0a389367..d813c72e1 100644 +index d85fab954..71ee66a9b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -63,6 +63,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -63,7 +63,7 @@ index e0a389367..d813c72e1 100644 public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStatistics, ICommandListener, Runnable { -@@ -151,6 +152,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -152,6 +153,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati public static final int TICK_TIME = 1000000000 / TPS; private static final int SAMPLE_INTERVAL = 100; public final double[] recentTps = new double[ 3 ]; @@ -71,7 +71,7 @@ index e0a389367..d813c72e1 100644 // Spigot end public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) { -@@ -765,6 +767,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -804,6 +806,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati protected void v() { SpigotTimings.serverTickTimer.startTiming(); // Spigot @@ -79,7 +79,7 @@ index e0a389367..d813c72e1 100644 long i = SystemUtils.c(); ++this.ticks; -@@ -825,6 +828,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati +@@ -864,6 +867,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati this.methodProfiler.e(); this.methodProfiler.e(); org.spigotmc.WatchdogThread.tick(); // Spigot diff --git a/CraftBukkit-Patches/0124-Configurable-Advancement-Disabling.patch b/CraftBukkit-Patches/0124-Configurable-Advancement-Disabling.patch index 40d4c6fe..b945eb1b 100644 --- a/CraftBukkit-Patches/0124-Configurable-Advancement-Disabling.patch +++ b/CraftBukkit-Patches/0124-Configurable-Advancement-Disabling.patch @@ -1,4 +1,4 @@ -From d0192a355ab91f7f2e735ef8352fc4e353c794f0 Mon Sep 17 00:00:00 2001 +From 557d17f26b5e730a891025a2d7b6b44459f83c09 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 9 Jun 2017 16:29:31 +1000 Subject: [PATCH] Configurable Advancement Disabling @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Advancement Disabling Allow disabling any (or all) inbuilt advancements with a configuration option. diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index 71d47b05..57918d3d 100644 +index fc34bc7ed..d0eb65aaf 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -201,6 +201,7 @@ public class AdvancementDataPlayer { @@ -18,7 +18,7 @@ index 71d47b05..57918d3d 100644 Iterator iterator = this.data.entrySet().iterator(); diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java -index 47279ebf..5a49181b 100644 +index 47279ebfd..5a49181bc 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java +++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java @@ -50,6 +50,11 @@ public class AdvancementDataWorld implements IResourcePackListener { @@ -34,7 +34,7 @@ index 47279ebf..5a49181b 100644 try { Advancement.SerializedAdvancement advancement_serializedadvancement = (Advancement.SerializedAdvancement) ChatDeserializer.a(AdvancementDataWorld.DESERIALIZER, IOUtils.toString(iresource.b(), StandardCharsets.UTF_8), Advancement.SerializedAdvancement.class); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index f3469d26..d95adc9b 100644 +index ed697b216..5175e9523 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -384,4 +384,11 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0125-Make-unloaded-chunk-saving-more-asynchronous.patch b/CraftBukkit-Patches/0125-Make-unloaded-chunk-saving-more-asynchronous.patch index b446722b..1085d6a9 100644 --- a/CraftBukkit-Patches/0125-Make-unloaded-chunk-saving-more-asynchronous.patch +++ b/CraftBukkit-Patches/0125-Make-unloaded-chunk-saving-more-asynchronous.patch @@ -1,4 +1,4 @@ -From c4ed57fb4dcf87450c2b2e4b771b5f6d17f2a049 Mon Sep 17 00:00:00 2001 +From 07d10e70dcd4930297ac817761eadabb24eca246 Mon Sep 17 00:00:00 2001 From: Geoff Crossland Date: Fri, 11 Aug 2017 19:23:58 +0100 Subject: [PATCH] Make unloaded chunk saving more asynchronous @@ -48,7 +48,7 @@ index d35203cc5..0296d3ef0 100644 } this.chunks.remove(chunk.chunkKey); diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index d95c87fd7..90d857105 100644 +index 6a99c9928..88301ee61 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -26,15 +26,20 @@ import java.util.function.Predicate; @@ -80,8 +80,17 @@ index d95c87fd7..90d857105 100644 - NBTTagCompound nbttagcompound = (NBTTagCompound) this.b.get(new ChunkCoordIntPair(i, j)); + NBTTagCompound nbttagcompound = SupplierUtils.getIfExists(this.b.get(new ChunkCoordIntPair(i, j))); // Spigot - return nbttagcompound != null ? nbttagcompound : this.b(generatoraccess, i, j); + return nbttagcompound != null ? nbttagcompound : this.a(generatoraccess.o().getDimensionManager(), generatoraccess.s_(), i, j, generatoraccess); // CraftBukkit } +@@ -110,7 +115,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { + nbttagcompound = GameProfileSerializer.a(this.d, DataFixTypes.CHUNK, nbttagcompound, Math.max(1493, k)); + if (k < 1519) { + nbttagcompound.setInt("DataVersion", 1519); +- this.a(new ChunkCoordIntPair(i, j), nbttagcompound); ++ this.a(new ChunkCoordIntPair(i, j), new SupplierUtils.ValueSupplier<>(nbttagcompound)); // Spigot + } + + return nbttagcompound; @@ -175,7 +180,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { public synchronized boolean chunkExists(int i, int j) { @@ -105,7 +114,7 @@ index d95c87fd7..90d857105 100644 world.checkSession(); try { -@@ -259,24 +270,41 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -259,8 +270,19 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { ChunkCoordIntPair chunkcoordintpair = ichunkaccess.getPos(); nbttagcompound.set("Level", nbttagcompound1); @@ -113,7 +122,7 @@ index d95c87fd7..90d857105 100644 + Supplier completion; + final long worldTime = world.getTime(); + final boolean worldHasSkyLight = world.worldProvider.g(); - if (ichunkaccess instanceof Chunk) { + if (ichunkaccess.i().d() == ChunkStatus.Type.LEVELCHUNK) { - this.saveBody((Chunk) ichunkaccess, world, nbttagcompound1); + final Chunk chunk = (Chunk) ichunkaccess; + saveEntities(nbttagcompound1, chunk, world); @@ -124,8 +133,9 @@ index d95c87fd7..90d857105 100644 + } + }; } else { -- if (this.b.containsKey(chunkcoordintpair) && this.a((NBTTagCompound) this.b.get(chunkcoordintpair)) == ChunkStatus.Type.LEVELCHUNK || this.a(this.b(world, chunkcoordintpair.x, chunkcoordintpair.z)) == ChunkStatus.Type.LEVELCHUNK) { -+ if (this.b.containsKey(chunkcoordintpair) && this.a(this.b.get(chunkcoordintpair).get()) == ChunkStatus.Type.LEVELCHUNK || this.a(this.b(world, chunkcoordintpair.x, chunkcoordintpair.z)) == ChunkStatus.Type.LEVELCHUNK) { + NBTTagCompound nbttagcompound2 = this.a(world, chunkcoordintpair.x, chunkcoordintpair.z); + +@@ -268,17 +290,23 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { return; } @@ -152,7 +162,7 @@ index d95c87fd7..90d857105 100644 this.b.put(chunkcoordintpair, nbttagcompound); FileIOThread.a().a(this); } -@@ -287,7 +315,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -289,7 +317,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } private synchronized boolean processSaveQueueEntry(boolean logCompletion) { @@ -161,7 +171,7 @@ index d95c87fd7..90d857105 100644 if (!iter.hasNext()) { if (logCompletion) { // CraftBukkit end -@@ -297,15 +325,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -299,15 +327,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { return false; } else { // CraftBukkit start @@ -180,7 +190,7 @@ index d95c87fd7..90d857105 100644 if (nbttagcompound != null) { try { -@@ -317,7 +346,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -319,7 +348,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { flag = true; } finally { @@ -189,7 +199,7 @@ index d95c87fd7..90d857105 100644 } return flag; -@@ -371,13 +400,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -373,13 +402,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } @@ -205,7 +215,7 @@ index d95c87fd7..90d857105 100644 nbttagcompound.setLong("InhabitedTime", protochunk.m()); nbttagcompound.setString("Status", protochunk.i().b()); ChunkConverter chunkconverter = protochunk.v(); -@@ -387,7 +416,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -389,7 +418,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } ChunkSection[] achunksection = protochunk.getSections(); @@ -214,7 +224,7 @@ index d95c87fd7..90d857105 100644 nbttagcompound.set("Sections", nbttaglist); BiomeBase[] abiomebase = protochunk.getBiomeIndex(); -@@ -457,10 +486,10 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -459,10 +488,10 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { nbttagcompound.set("Structures", this.a(i, j, protochunk.e(), protochunk.f())); } @@ -227,7 +237,7 @@ index d95c87fd7..90d857105 100644 nbttagcompound.setLong("InhabitedTime", chunk.m()); nbttagcompound.setString("Status", chunk.i().b()); ChunkConverter chunkconverter = chunk.F(); -@@ -470,7 +499,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -472,7 +501,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } ChunkSection[] achunksection = chunk.getSections(); @@ -236,7 +246,7 @@ index d95c87fd7..90d857105 100644 nbttagcompound.set("Sections", nbttaglist); BiomeBase[] abiomebase = chunk.getBiomeIndex(); -@@ -481,6 +510,12 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -483,6 +512,12 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { } nbttagcompound.setIntArray("Biomes", aint); @@ -249,7 +259,7 @@ index d95c87fd7..90d857105 100644 chunk.f(false); NBTTagList nbttaglist1 = new NBTTagList(); -@@ -790,9 +825,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { +@@ -788,9 +823,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { return protochunk; } diff --git a/CraftBukkit-Patches/0126-Allow-changing-minimum-squid-spawn-range.patch b/CraftBukkit-Patches/0126-Allow-changing-minimum-squid-spawn-range.patch index 375ee0e4..6815d565 100644 --- a/CraftBukkit-Patches/0126-Allow-changing-minimum-squid-spawn-range.patch +++ b/CraftBukkit-Patches/0126-Allow-changing-minimum-squid-spawn-range.patch @@ -1,11 +1,11 @@ -From 0478deb08e81e15c102266e3cee1a3586c74a604 Mon Sep 17 00:00:00 2001 +From b1932ec6749db1a8073e59e76b36688b473d08b3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 11 Jan 2018 08:23:43 +1100 Subject: [PATCH] Allow changing minimum squid spawn range diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 34a3633a..ffc6d0b6 100644 +index 764dec080..97de169de 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -167,7 +167,7 @@ public class EntitySquid extends EntityWaterAnimal { @@ -18,7 +18,7 @@ index 34a3633a..ffc6d0b6 100644 public void c(float f, float f1, float f2) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index e146308b..9128f775 100644 +index e146308ba..9128f7754 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -306,4 +306,10 @@ public class SpigotWorldConfig