From 806e192e26ba03bbeb483ec6c19efedf546bc6da Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 12 Dec 2019 03:08:47 +0000 Subject: [PATCH] Fix API compile Bzzzzzzz --- Spigot-API-Patches/0155-Add-Material-Tags.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch index 9d5d67deb0..053cd22cbb 100644 --- a/Spigot-API-Patches/0155-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From 4796b64034eb24c4b0a5d77c44dac10a16715e91 Mon Sep 17 00:00:00 2001 +From b0bcbd742cd31fe87bde4791e386dc1f85bc14a2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 17 Jul 2018 01:27:15 -0400 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 new file mode 100644 -index 000000000..c91ea2a06 +index 00000000..c91ea2a0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java @@ -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 new file mode 100644 -index 000000000..ef1e2c191 +index 00000000..88556fdb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java @@ -0,0 +1,374 @@ @@ -518,7 +518,7 @@ index 000000000..ef1e2c191 + */ + public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs")) + .endsWith("_SPAWN_EGG") -+ .ensureSize("SPAWN_EGGS", 58); ++ .ensureSize("SPAWN_EGGS", 59); + + /** + * 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 new file mode 100644 -index 000000000..328c51471 +index 00000000..328c5147 --- /dev/null +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java @@ -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 -index 61993528e..5f9d34824 100644 +index 61993528..5f9d3482 100644 --- a/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 { @@ -635,5 +635,5 @@ index 61993528e..5f9d34824 100644 Server.class.getMethod("getPluginManager"), new MethodHandler() { -- -2.21.0 +2.24.1