Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-29 23:17:44 +02:00
Code Issues Projects Releases Wiki Activity

Fix API compile

Browse Source 
Bzzzzzzz
This commit is contained in:
Shane Freeder 2019-12-12 03:08:47 +00:00
parent bbf27ec651
commit 806e192e26
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-API-Patches/0155-Add-Material-Tags.patch
View File

@ -1,4 +1,4 @@
From 4796b64034eb24c4b0a5d77c44dac10a16715e91 Mon Sep 17 00:00:00 2001 From b0bcbd742cd31fe87bde4791e386dc1f85bc14a2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 17 Jul 2018 01:27:15 -0400 Date: Tue, 17 Jul 2018 01:27:15 -0400
Subject: [PATCH] Add Material Tags Subject: [PATCH] Add Material Tags
@ -8,7 +8,7 @@ are related to each other by a trait.
diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
new file mode 100644 new file mode 100644
index 000000000..c91ea2a06 index 00000000..c91ea2a0
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java
@@ -0,0 +1,190 @@ @@ -0,0 +1,190 @@
@ -204,7 +204,7 @@ index 000000000..c91ea2a06
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
new file mode 100644 new file mode 100644
index 000000000..ef1e2c191 index 00000000..88556fdb
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
@@ -0,0 +1,374 @@ @@ -0,0 +1,374 @@
@ -518,7 +518,7 @@ index 000000000..ef1e2c191
+ */ + */
+ public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs")) + public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
+ .endsWith("_SPAWN_EGG") + .endsWith("_SPAWN_EGG")
+ .ensureSize("SPAWN_EGGS", 58); + .ensureSize("SPAWN_EGGS", 59);
+ +
+ /** + /**
+ * Covers all 16 colors of stained glass. + * Covers all 16 colors of stained glass.
@ -584,7 +584,7 @@ index 000000000..ef1e2c191
+} +}
diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
new file mode 100644 new file mode 100644
index 000000000..328c51471 index 00000000..328c5147
--- /dev/null --- /dev/null
+++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
@ -614,7 +614,7 @@ index 000000000..328c51471
+ } + }
+} +}
diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
index 61993528e..5f9d34824 100644 index 61993528..5f9d3482 100644
--- a/src/test/java/org/bukkit/TestServer.java --- a/src/test/java/org/bukkit/TestServer.java
+++ b/src/test/java/org/bukkit/TestServer.java +++ b/src/test/java/org/bukkit/TestServer.java
@@ -29,6 +29,16 @@ public final class TestServer implements InvocationHandler { @@ -29,6 +29,16 @@ public final class TestServer implements InvocationHandler {
@ -635,5 +635,5 @@ index 61993528e..5f9d34824 100644
Server.class.getMethod("getPluginManager"), Server.class.getMethod("getPluginManager"),
new MethodHandler() { new MethodHandler() {
-- --
2.21.0 2.24.1