Update Spigot's Patches

Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf

This new system breaks a lot :(
This commit is contained in:
Zach Brown 2014-11-28 18:03:01 -06:00
parent b547153ec6
commit 06c1cf41ab
36 changed files with 38 additions and 38 deletions

View File

@ -1,4 +1,4 @@
From 20956e8769aa775aeac3d6d21dc3860575066443 Mon Sep 17 00:00:00 2001 From dd1ac6c30d00ee3df85d519665f0542dce550125 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000 Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes

View File

@ -1,4 +1,4 @@
From 441af32c70779242830099187105998737549c45 Mon Sep 17 00:00:00 2001 From b0a368f53e4f88a99b1b2bdbabc4815a501710d4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000 Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings Subject: [PATCH] Spigot Timings

View File

@ -1,4 +1,4 @@
From 0a83eb0476ad914249b85f2b55e76c6bdc41e253 Mon Sep 17 00:00:00 2001 From 22072de889e694efa2591459aa9ef70543589e52 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:31:20 +1100 Date: Mon, 4 Mar 2013 18:31:20 +1100
Subject: [PATCH] Add PlayerItemDamageEvent Subject: [PATCH] Add PlayerItemDamageEvent

View File

@ -1,4 +1,4 @@
From ef1350a00ce855de556998df6f44cc1510aae924 Mon Sep 17 00:00:00 2001 From ec36673732a8222bd6fdd768caa5cd10af0c9a8d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000 Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support Subject: [PATCH] BungeeCord Support

View File

@ -1,4 +1,4 @@
From 434fe0ecc9bed38528fa1985f0e7f69f463db736 Mon Sep 17 00:00:00 2001 From 49201e12ef4fa652371f467ab74a8d3fc97b8819 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:08:24 +1000 Date: Sun, 2 Jun 2013 15:08:24 +1000
Subject: [PATCH] Add Arrow API Subject: [PATCH] Add Arrow API

View File

@ -1,4 +1,4 @@
From 9df89a6e4e1111b34f0aa250d4ef06f7453c145a Mon Sep 17 00:00:00 2001 From 4e94c64d46706f12a51a9582248fc219e91ba5c9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000 Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API Subject: [PATCH] Add Particle API

View File

@ -1,4 +1,4 @@
From eccd4ba94b9d646d2f59e678882ef616d7c07867 Mon Sep 17 00:00:00 2001 From e8e1da764520aaca81f71226b5ee28b2b03d6f56 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com> From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:01 -0500 Date: Mon, 15 Apr 2013 20:06:01 -0500
Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent

View File

@ -1,4 +1,4 @@
From 8a59d111c2a1e4028474c264c94d35fd42c9b0a7 Mon Sep 17 00:00:00 2001 From 4628c568a6f40da7af00dd0a408d742325b5bcd4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:53 +1000 Date: Tue, 2 Jul 2013 20:32:53 +1000
Subject: [PATCH] Entity Mount and Dismount Events Subject: [PATCH] Entity Mount and Dismount Events

View File

@ -1,4 +1,4 @@
From 6fb58d4e83fcb4fc453990d6367c61ae6f4222e8 Mon Sep 17 00:00:00 2001 From 7b44571affe815589259e70786fb3073f827a9a1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 4 Jul 2013 20:05:19 +1000 Date: Thu, 4 Jul 2013 20:05:19 +1000
Subject: [PATCH] Update Depends Subject: [PATCH] Update Depends
@ -6,7 +6,7 @@ Subject: [PATCH] Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries. - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index c5ce4b2..b5ad32f 100644 index 87c0c58..072f84d 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -83,21 +83,21 @@ @@ -83,21 +83,21 @@

View File

@ -1,4 +1,4 @@
From 24bc955987cc5738a8df959a894418e70e42d964 Mon Sep 17 00:00:00 2001 From 3d6ccae10dacffd2a1e1b88fc8684e91615491db Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 7 Jul 2013 10:32:05 -0400 Date: Sun, 7 Jul 2013 10:32:05 -0400
Subject: [PATCH] InventoryClickEvent getClickedInventory Subject: [PATCH] InventoryClickEvent getClickedInventory

View File

@ -1,4 +1,4 @@
From e871dc1552f172369cd309b6ac9ed0af08f25280 Mon Sep 17 00:00:00 2001 From fcb2b26c3c2667fe9ace094a0f7761b94c8a2227 Mon Sep 17 00:00:00 2001
From: Alex Bennett <alex.eugene.bennett@gmail.com> From: Alex Bennett <alex.eugene.bennett@gmail.com>
Date: Thu, 11 Jul 2013 15:31:32 -0500 Date: Thu, 11 Jul 2013 15:31:32 -0500
Subject: [PATCH] Added getAllSessionData() to the Conversation API. Subject: [PATCH] Added getAllSessionData() to the Conversation API.

View File

@ -1,4 +1,4 @@
From ed8a52ebe4d123ca8a03e1b34b463369d44a67d1 Mon Sep 17 00:00:00 2001 From fb647ff8d9496446af81c8cc3c8b7601307f49e8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Mon, 22 Jul 2013 19:09:43 +1000 Date: Mon, 22 Jul 2013 19:09:43 +1000
Subject: [PATCH] Catch Conversation API Errors Subject: [PATCH] Catch Conversation API Errors

View File

@ -1,4 +1,4 @@
From 3eb055ccbeea11a57734515378a8c838e6ac764c Mon Sep 17 00:00:00 2001 From 4acd1068f9b97d884691f4ad67155fc12137d88b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000 Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API Subject: [PATCH] Player Collision API

View File

@ -1,4 +1,4 @@
From 453c8160b0223029c3c10d03999501bed6a031ba Mon Sep 17 00:00:00 2001 From 087f69161489f86c83539227ce904da9083e2936 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:42:16 +1000 Date: Sat, 3 Aug 2013 19:42:16 +1000
Subject: [PATCH] Expand Boolean Prompt Values Subject: [PATCH] Expand Boolean Prompt Values

View File

@ -1,4 +1,4 @@
From dd4b8a4e0eaade34eea01efb407fa13d1cf4af4c Mon Sep 17 00:00:00 2001 From 67afcb6369ce63129febfee23b98af40eb087e9d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:49:36 +1000 Date: Sat, 3 Aug 2013 19:49:36 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability Subject: [PATCH] Add Getter for Entity Invulnerability

View File

@ -1,4 +1,4 @@
From d352e90012958d648c73e7dddce37ddf203b4e98 Mon Sep 17 00:00:00 2001 From bf72ae80438382daf8d9f521134cf179a7190737 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org> From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:35:58 +0200 Date: Tue, 8 Oct 2013 14:35:58 +0200
Subject: [PATCH] Add respawn API. Subject: [PATCH] Add respawn API.

View File

@ -1,4 +1,4 @@
From e2827f8e0e31219b75692ad0c866d5f4bc8bb0f3 Mon Sep 17 00:00:00 2001 From 0c34aae223d9c348e66229d0417ab1edc8c0aa0e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 19 Oct 2013 12:59:42 +1100 Date: Sat, 19 Oct 2013 12:59:42 +1100
Subject: [PATCH] Fix Plugin Message API Disconnects Subject: [PATCH] Fix Plugin Message API Disconnects

View File

@ -1,4 +1,4 @@
From 85cbff874a815bdd616d06c1131e94a3c6e404a1 Mon Sep 17 00:00:00 2001 From 349cd47d9d2c3106268c159fffc22ecb1f7c5cf4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 24 Dec 2013 10:14:25 +1100 Date: Tue, 24 Dec 2013 10:14:25 +1100
Subject: [PATCH] Fix Tab Completion for Some Commands Subject: [PATCH] Fix Tab Completion for Some Commands

View File

@ -1,4 +1,4 @@
From 7f9ceb022a4ff2257c94be5515fb4fdb5b887af4 Mon Sep 17 00:00:00 2001 From 6e52589f3fd5a62af1f1d7ab5f3675c3abe2b44f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Thu, 23 Jan 2014 13:17:38 +1100 Date: Thu, 23 Jan 2014 13:17:38 +1100
Subject: [PATCH] Add Spigot Links Subject: [PATCH] Add Spigot Links

View File

@ -1,4 +1,4 @@
From 285e74b3c673699d5ccf9241dc89e6cd010a3c68 Mon Sep 17 00:00:00 2001 From 90d2cf3540f67d6c800368a956d7d30c26848d43 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net> From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:10:49 +1100 Date: Sat, 1 Feb 2014 18:10:49 +1100
Subject: [PATCH] Implement Locale Getter for Players Subject: [PATCH] Implement Locale Getter for Players

View File

@ -1,4 +1,4 @@
From a3cdd140f2359b7a19b3adbf10c770207a337070 Mon Sep 17 00:00:00 2001 From fae0a406ff3f9fabd710b087a4f5832aa6d286e6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500 Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players Subject: [PATCH] Add support for fetching hidden players

View File

@ -1,4 +1,4 @@
From 3950fb168ff04d6e29577c9c4a08d7c2b7656b78 Mon Sep 17 00:00:00 2001 From 5f2f41da4c36fb986e6983189c88a9d2724b2c2d Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com> From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400 Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API Subject: [PATCH] Silenceable Lightning API

View File

@ -1,4 +1,4 @@
From e3225adc7599d9748290a68334ec8635b803d6c1 Mon Sep 17 00:00:00 2001 From 2e00384fb6d1ad3049d6b0cab07b128c4d7892f1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 30 Mar 2014 15:58:22 +1100 Date: Sun, 30 Mar 2014 15:58:22 +1100
Subject: [PATCH] Remove deprecation on some player lookup methods Subject: [PATCH] Remove deprecation on some player lookup methods

View File

@ -1,4 +1,4 @@
From 96c041a8ac1d923260b223185fa51e9a9fdcf0d8 Mon Sep 17 00:00:00 2001 From 0c6e10446a706e18998b904c3215b78189137f58 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Thu, 17 Apr 2014 19:22:26 +1000 Date: Thu, 17 Apr 2014 19:22:26 +1000
Subject: [PATCH] Expand team API to allow arbitrary strings. Subject: [PATCH] Expand team API to allow arbitrary strings.

View File

@ -1,4 +1,4 @@
From 61249f066edcdf474dd11f93aedfa621241d4a3e Mon Sep 17 00:00:00 2001 From 2dd486923aa364890c40ab072b20bd601d038431 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Thu, 17 Apr 2014 19:35:13 +1000 Date: Thu, 17 Apr 2014 19:35:13 +1000
Subject: [PATCH] Add Score.isScoreSet()Z API. Subject: [PATCH] Add Score.isScoreSet()Z API.

View File

@ -1,4 +1,4 @@
From 5c06d1fef805814a36289acf6f6bacdbdc29187d Mon Sep 17 00:00:00 2001 From 385b88204bd3697d77df216b85eae5000c1aefd7 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org> From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:01:32 +0200 Date: Tue, 8 Apr 2014 14:01:32 +0200
Subject: [PATCH] Add PlayerSpawnLocationEvent. Subject: [PATCH] Add PlayerSpawnLocationEvent.

View File

@ -1,4 +1,4 @@
From 1248aadefde8e330cf79289c4a87cdc47b16ebb4 Mon Sep 17 00:00:00 2001 From a1f943c6a96039f0c32d66840c7733d34eab815f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Wed, 16 Jul 2014 17:24:21 +1000 Date: Wed, 16 Jul 2014 17:24:21 +1000
Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
@ -6,7 +6,7 @@ Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
When on Java 7 we can register the classloader as parallel capable to prevent deadlocks caused by certain scenarios. Due to the nature of PluginClassLoader this isn't completely safe, but we can make it safer by switching to concurrency focused collections. Either way this is far better than crashing the server. When on Java 7 we can register the classloader as parallel capable to prevent deadlocks caused by certain scenarios. Due to the nature of PluginClassLoader this isn't completely safe, but we can make it safer by switching to concurrency focused collections. Either way this is far better than crashing the server.
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index fe723c9..f8ef65b 100644 index 3e60a7b..5a57379 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -48,7 +48,7 @@ import org.yaml.snakeyaml.error.YAMLException; @@ -48,7 +48,7 @@ import org.yaml.snakeyaml.error.YAMLException;

View File

@ -1,4 +1,4 @@
From c789d5147f42f303e3a504827abbadb3c4a72b87 Mon Sep 17 00:00:00 2001 From 6ba7952d089c68b5441f201bcac309c1c57a2d4c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 22 Jul 2014 21:01:32 +1000 Date: Tue, 22 Jul 2014 21:01:32 +1000
Subject: [PATCH] Fix slow tab complete for some commands. Subject: [PATCH] Fix slow tab complete for some commands.

View File

@ -1,4 +1,4 @@
From 77013c32824c02e4395a7488b96be98859296a7a Mon Sep 17 00:00:00 2001 From 31ac5fc27218ece6f6ae7f493bf8aede012c72ca Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu> From: drXor <mcyoung@mit.edu>
Date: Wed, 23 Jul 2014 15:50:36 -0400 Date: Wed, 23 Jul 2014 15:50:36 -0400
Subject: [PATCH] Undeprecate Player#updateInventory()V Subject: [PATCH] Undeprecate Player#updateInventory()V

View File

@ -1,4 +1,4 @@
From 5ba93a51ec3f858ec324be5cbeeda7d677c91526 Mon Sep 17 00:00:00 2001 From 061fe4dee6e1a5f670bf8fb4d522fd46c81e2786 Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com> From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:31:04 -0400 Date: Fri, 22 Aug 2014 05:31:04 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

View File

@ -1,4 +1,4 @@
From 7b6992e7d0858c798faf863a56d8e376eb4a1e81 Mon Sep 17 00:00:00 2001 From 83e927d3f63812b935f753935940351b16b9ba34 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Mon, 1 Sep 2014 19:36:20 +1000 Date: Mon, 1 Sep 2014 19:36:20 +1000
Subject: [PATCH] Skip loading of plugins which are not 1.8 compatible. Subject: [PATCH] Skip loading of plugins which are not 1.8 compatible.

View File

@ -1,4 +1,4 @@
From e0284f9b22d544d5b8c196a1d62ab13ebe88185b Mon Sep 17 00:00:00 2001 From a4d1898ef818a8c6d1b8acc134e91b5a4d434733 Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com> From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:35:16 -0400 Date: Fri, 22 Aug 2014 05:35:16 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

View File

@ -1,4 +1,4 @@
From 265a90e2abf27ff89a68af0586fd169cc5f9f21e Mon Sep 17 00:00:00 2001 From 9fe3161a179aaa74e24f062dec45d755d14efa0e Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu> From: drXor <mcyoung@mit.edu>
Date: Sat, 9 Aug 2014 13:56:51 -0400 Date: Sat, 9 Aug 2014 13:56:51 -0400
Subject: [PATCH] Configurable Hanging Tick Subject: [PATCH] Configurable Hanging Tick

View File

@ -1,4 +1,4 @@
From c65d254f386c8a1fe9dddd64bf2414fe5f92dcf2 Mon Sep 17 00:00:00 2001 From 6fd03495f3b5797a699b06523e7ef360c1d58b89 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 21 Sep 2014 10:06:01 +1000 Date: Sun, 21 Sep 2014 10:06:01 +1000
Subject: [PATCH] Fix Some Memory Leaks Subject: [PATCH] Fix Some Memory Leaks

View File

@ -1,4 +1,4 @@
From afd4eb42e140af6c14d5cd60fa0cd1e22270fe56 Mon Sep 17 00:00:00 2001 From 5daf123960e571270e71994bb628a3e1ded65fe3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 30 Sep 2014 21:43:15 +1000 Date: Tue, 30 Sep 2014 21:43:15 +1000
Subject: [PATCH] Refactor ItemDoor Place Subject: [PATCH] Refactor ItemDoor Place

View File

@ -1,4 +1,4 @@
From 68104d0578657519dab57aa94806d71823686fc1 Mon Sep 17 00:00:00 2001 From efa2b170f2ca3ca35c18bcbc906c68696aa6b3c1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 30 Sep 2014 21:49:10 +1000 Date: Tue, 30 Sep 2014 21:49:10 +1000
Subject: [PATCH] Don't Fire InventoryCloseEvent Unless Required Subject: [PATCH] Don't Fire InventoryCloseEvent Unless Required