Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 19:40:07 +01:00
Code Issues Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen 
runtime materials is different than unit test.

prob going to run into this again in future, will worry about it then
Dieser Commit ist enthalten in:
Aikar 2018-10-10 23:39:36 -04:00
Ursprung fe01fa5641
Commit 69cad796ab
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 401ADFC9891FAAFE
1 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
Spigot-API-Patches/0158-Add-Material-Tags.patch
Datei anzeigen

@ -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