aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-API-Patches
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-API-Patches')
-rw-r--r--Spigot-API-Patches/0001-POM-changes.patch14
-rw-r--r--Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch14
-rw-r--r--Spigot-API-Patches/0005-Add-getTPS-method.patch24
-rw-r--r--Spigot-API-Patches/0006-Add-async-chunk-load-API.patch14
-rw-r--r--Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch14
5 files changed, 40 insertions, 40 deletions
diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index a18a62e0be..1b2e3155b7 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From d2964723ffed5f0bbf1fef361f554666b43d53e7 Mon Sep 17 00:00:00 2001
+From 9adc816d4a4214efb78ec4db9354eb5cb4f9bbe0 Mon Sep 17 00:00:00 2001
From: Zach Brown <[email protected]>
Date: Mon, 29 Feb 2016 17:16:08 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
-index 217ce0b..8f0fb79 100644
+index 217ce0b9..8f0fb798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,35 +4,37 @@
@@ -95,10 +95,11 @@ index 217ce0b..8f0fb79 100644
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-@@ -129,26 +146,6 @@
+@@ -128,26 +145,6 @@
+ </dependency>
</dependencies>
</plugin>
- <plugin>
+- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.14</version>
@@ -118,10 +119,9 @@ index 217ce0b..8f0fb79 100644
- </signature>
- </configuration>
- </plugin>
-- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4.1</version>
--
-2.10.2
+2.34.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 da70825a68..e2311bce3c 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,17 +1,18 @@
-From 68c630ca51baec9eb6c20b206e7119fd72c9c854 Mon Sep 17 00:00:00 2001
+From 7384d452c0f322347e136d54a34373c148a8a8cc Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
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 46df34d..5e5e5e4 100644
+index 8f0fb798..a2515c28 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -55,6 +55,19 @@
+@@ -54,6 +54,19 @@
+ </repositories>
<dependencies>
- <dependency>
++ <dependency>
+ <groupId>net.sf.trove4j</groupId>
+ <artifactId>trove4j</artifactId>
+ <version>3.0.3</version>
@@ -24,10 +25,9 @@ index 46df34d..5e5e5e4 100644
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
-+ <dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
--
-2.9.0
+2.34.0
diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0005-Add-getTPS-method.patch
index ab8c17c677..d4739b1d65 100644
--- a/Spigot-API-Patches/0005-Add-getTPS-method.patch
+++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch
@@ -1,17 +1,18 @@
-From 5c2caa3ee27bbd84914df4a001cfb7bcb528b3a2 Mon Sep 17 00:00:00 2001
+From 89bf27993307d5c147a030e8736f656aa6c42a83 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 85fd9a8..8d602a3 100644
+index 85fd9a83..8d602a3e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1140,6 +1140,14 @@ public final class Bukkit {
+@@ -1139,6 +1139,14 @@ public final class Bukkit {
+ return server.createBossBar(title, color, style, flags);
}
- /**
++ /**
+ * Gets the current server TPS
+ * @return current server TPS (1m, 5m, 15m in Paper-Server)
+ */
@@ -19,28 +20,27 @@ index 85fd9a8..8d602a3 100644
+ return server.getTPS();
+ }
+
-+ /**
+ /**
* @see UnsafeValues
* @return the unsafe values instance
- */
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f82cbaf..6e23b0c 100644
+index f82cbaf5..6e23b0ce 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -934,6 +934,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -933,6 +933,13 @@ public interface Server extends PluginMessageRecipient {
+ */
BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags);
- /**
++ /**
+ * Gets the current server TPS
+ *
+ * @return current server TPS (1m, 5m, 15m in Paper-Server)
+ */
+ public double[] getTPS();
+
-+ /**
+ /**
* @see UnsafeValues
* @return the unsafe values instance
- */
--
-2.9.2.windows.1
+2.34.0
diff --git a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
index 77a7cb65c7..f61836b5ea 100644
--- a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
+++ b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
@@ -1,17 +1,18 @@
-From 90daaa2067899aa0bea025e45ee3e98ad862275a Mon Sep 17 00:00:00 2001
+From 2baad952536f2c0fd477dda9004f0fab7c49fbee Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Mon, 29 Feb 2016 17:43:33 -0600
Subject: [PATCH] Add async chunk load API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 339afe4..ce92fef 100644
+index 0d48c9f0..1d4ece89 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -135,6 +135,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -134,6 +134,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
+ */
public Chunk getChunkAt(Block block);
- /**
++ /**
+ * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods
+ * to request a {@link Chunk} to be loaded, with this callback receiving
+ * the chunk when it is finished.
@@ -83,10 +84,9 @@ index 339afe4..ce92fef 100644
+ */
+ public void getChunkAtAsync(Block block, ChunkLoadCallback cb);
+
-+ /**
+ /**
* Checks if the specified {@link Chunk} is loaded
*
- * @param chunk The chunk to check
--
-2.9.2.windows.1
+2.34.0
diff --git a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
index c19c3a63d4..f133df538b 100644
--- a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
@@ -1,4 +1,4 @@
-From 804562f99c8f2bf6b5d9937d5a7816974c716502 Mon Sep 17 00:00:00 2001
+From a74caf7bb6b8a4a4bb552ec8507b778c1c510375 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Tue, 16 Jul 2013 21:26:50 -0400
Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@@ -6,13 +6,14 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
So that on reload, metadata will be cleared
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index 64c0f0a..6da6abd 100644
+index 64c0f0a7..6da6abd8 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-@@ -125,6 +125,26 @@ public abstract class MetadataStoreBase<T> {
+@@ -124,6 +124,26 @@ public abstract class MetadataStoreBase<T> {
+ }
}
- /**
++ /**
+ * Removes all metadata in the metadata store that originates from the
+ * given plugin.
+ *
@@ -32,10 +33,9 @@ index 64c0f0a..6da6abd 100644
+ }
+ }
+
-+ /**
+ /**
* Creates a unique name for the object receiving metadata by combining
* unique data from the subject with a metadataKey.
- * <p>
--
-2.9.2.windows.1
+2.34.0