diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 0ce6f0e91f..d34dab8cb7 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,14 +1,14 @@ -From 7836876ec5222a072d9d65d965f4edcc0ea8bbe4 Mon Sep 17 00:00:00 2001 +From f689646087896900f4b4a46521b3a5d5487184b3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 7c81917d..4c5bda27 100644 +index 7c81917d..3889d668 100644 --- a/pom.xml +++ b/pom.xml -@@ -3,39 +3,39 @@ +@@ -3,46 +3,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -40,50 +40,45 @@ index 7c81917d..4c5bda27 100644 UTF-8 - - +- +- - spigotmc-releases - https://hub.spigotmc.org/nexus/content/repositories/releases/ -+ destroystokyo-releases -+ https://destroystokyo.com/repo/repository/maven-releases/ - - +- +- - spigotmc-snapshots - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ -+ destroystokyo-snapshots -+ https://destroystokyo.com/repo/repository/maven-snapshots/ - - - -- -- -- spigotmc-public -- https://hub.spigotmc.org/nexus/content/groups/public/ -- -- -- - - - spigotmc-public -@@ -43,6 +43,17 @@ - - - -+ -+ +- +- ++ ++ + spigotmc-public + https://hub.spigotmc.org/nexus/content/groups/public/ -+ ++ ++ + + + + spigotmc-public + https://hub.spigotmc.org/nexus/content/groups/public/ + + + sonatype + https://oss.sonatype.org/content/groups/public/ + -+ -+ + + +- +- +- spigotmc-public +- https://hub.spigotmc.org/nexus/content/groups/public/ +- +- +- commons-lang -@@ -56,6 +67,13 @@ +@@ -56,6 +56,13 @@ 1.1.1 compile @@ -97,7 +92,7 @@ index 7c81917d..4c5bda27 100644 com.google.guava -@@ -100,15 +118,12 @@ +@@ -100,15 +107,12 @@ @@ -114,7 +109,7 @@ index 7c81917d..4c5bda27 100644 -@@ -131,6 +146,7 @@ +@@ -131,6 +135,7 @@ @@ -122,7 +117,7 @@ index 7c81917d..4c5bda27 100644 true -@@ -138,33 +154,4 @@ +@@ -138,33 +143,4 @@ @@ -157,5 +152,5 @@ index 7c81917d..4c5bda27 100644 - -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch index db536d295d..dc6051cddd 100644 --- a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch @@ -1,14 +1,14 @@ -From f428f0343bf4b0aa2c42fa1755d9523eaec91d3b Mon Sep 17 00:00:00 2001 +From bf38aff997d53e25de73849488a72a7422f36b97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 1 Apr 2016 00:02:47 -0400 Subject: [PATCH] add Trove and FastUtil to Bukkit diff --git a/pom.xml b/pom.xml -index 4220760f..623d9eae 100644 +index 3889d668..c5b3f430 100644 --- a/pom.xml +++ b/pom.xml -@@ -55,6 +55,19 @@ +@@ -44,6 +44,19 @@ @@ -29,5 +29,5 @@ index 4220760f..623d9eae 100644 commons-lang commons-lang -- -2.16.2 +2.19.0 diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch index b21251cca5..d056bb6ac8 100644 --- a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From 15b5224e92a45ca15a6e5d34f97734922e539b92 Mon Sep 17 00:00:00 2001 +From d70c376fbf3dfc694895e80aba6a00df4b88c775 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index 8d4032e2..21a4a8be 100644 +index c5b3f430..09c42fe2 100644 --- a/pom.xml +++ b/pom.xml -@@ -128,6 +128,17 @@ +@@ -117,6 +117,17 @@ 1.3 test @@ -427,5 +427,5 @@ index d8b9c244..40fd71dc 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { -- -2.17.0 +2.19.0 diff --git a/Spigot-API-Patches/0059-Profile-Lookup-Events.patch b/Spigot-API-Patches/0059-Profile-Lookup-Events.patch index adaec2f85f..df2e4769a6 100644 --- a/Spigot-API-Patches/0059-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0059-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From b1eb117fbca758844625ae8de33b71f3d526ea0a Mon Sep 17 00:00:00 2001 +From 4c9bcc7cd688a1c959ea8335a93b16c888d36f83 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 16:30:44 -0400 Subject: [PATCH] Profile Lookup Events @@ -7,10 +7,10 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p profiles that had to be looked up. diff --git a/pom.xml b/pom.xml -index c8b37997..13994dc2 100644 +index 09c42fe2..d75bf7da 100644 --- a/pom.xml +++ b/pom.xml -@@ -62,6 +62,13 @@ +@@ -51,6 +51,13 @@ provided @@ -241,5 +241,5 @@ index 00000000..aa0666d5 + +} -- -2.15.1 +2.19.0 diff --git a/Spigot-API-Patches/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0069-Allow-plugins-to-use-SLF4J-for-logging.patch index 7e9cb03ad4..c79b75b7ca 100644 --- a/Spigot-API-Patches/0069-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0069-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 21357c1c249a2ebea454a1bb6b7b435c3fecdbfa Mon Sep 17 00:00:00 2001 +From fe849acd162816d608ef8b797037f95cfbb95dc3 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 13994dc2..45145c5f 100644 +index d75bf7da..2fa2dd7c 100644 --- a/pom.xml +++ b/pom.xml -@@ -122,6 +122,14 @@ +@@ -111,6 +111,14 @@ compile @@ -33,7 +33,7 @@ index 13994dc2..45145c5f 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index c4e22c62..02670254 100644 +index 55debf5d..8d2999ac 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -157,6 +157,12 @@ public interface Plugin extends TabExecutor { @@ -50,5 +50,5 @@ index c4e22c62..02670254 100644 * Returns the name of the plugin. *

-- -2.15.1 +2.19.0 diff --git a/pom.xml b/pom.xml index 6522a82da3..d7afcb29ab 100644 --- a/pom.xml +++ b/pom.xml @@ -43,12 +43,12 @@ - destroystokyo-releases - https://destroystokyo.com/repo/repository/maven-releases/ + papermc-releases + https://papermc.io/repo/repository/maven-releases/ - destroystokyo-snapshots - https://destroystokyo.com/repo/repository/maven-snapshots/ + papermc-snapshots + https://papermc.io/repo/repository/maven-snapshots/