core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore colorable size in test, NMS Tags not loaded at unit test 

runtime materials is different than unit test.

prob going to run into this again in future, will worry about it then
This commit is contained in:
Aikar 2018-10-10 23:39:36 -04:00
parent fe01fa5641
commit 69cad796ab
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-API-Patches/0158-Add-Material-Tags.patch
View File

@ -1,4 +1,4 @@
From 6660a7217a5b429e5aa5c186e9f71c0fda561660 Mon Sep 17 00:00:00 2001 From 340d4255fde17caa3dff4eed9f2c63aab197f877 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
@ -153,7 +153,7 @@ index 000000000..b4f78e075
+} +}
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..92bb0aef5 index 000000000..7a48445da
--- /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,377 @@ @@ -0,0 +1,377 @@
@ -531,8 +531,8 @@ index 000000000..92bb0aef5
+ +
+ @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked")
+ public static final MaterialSetTag COLORABLE = new MaterialSetTag() + public static final MaterialSetTag COLORABLE = new MaterialSetTag()
+ .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS) + .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS);
+ .ensureSize("COLORABLE", 81); + //.ensureSize("COLORABLE", 81); unit test don't have the vanilla item tags, so counts don't line up for real
+} +}
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
@ -587,5 +587,5 @@ index 2d8403206..613675c3b 100644
Server.class.getMethod("getPluginManager"), Server.class.getMethod("getPluginManager"),
new MethodHandler() { new MethodHandler() {
-- --
2.19.0 2.19.1