aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-API-Patches
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2018-10-08 01:33:25 -0400
committerAikar <[email protected]>2018-10-08 01:33:25 -0400
commit676ba6206deb86cf8063ab3f894c4738fc3eeb89 (patch)
tree14c495ef1add90dec5ccbafa18e3f0023467fbf0 /Spigot-API-Patches
parent1f5866fcf87d0a2b2b69ad4f6c69164b4442da97 (diff)
downloadPaper-676ba6206deb86cf8063ab3f894c4738fc3eeb89.tar.gz
Paper-676ba6206deb86cf8063ab3f894c4738fc3eeb89.zip
Fix MaterialTagTest deterministic ordering
Tacos > Burritos
Diffstat (limited to 'Spigot-API-Patches')
-rw-r--r--Spigot-API-Patches/0158-Add-Material-Tags.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/Spigot-API-Patches/0158-Add-Material-Tags.patch b/Spigot-API-Patches/0158-Add-Material-Tags.patch
index 678d4d959d..c4f6723050 100644
--- a/Spigot-API-Patches/0158-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0158-Add-Material-Tags.patch
@@ -1,4 +1,4 @@
-From 9451a08ced2d13e369f3c2f4c3aea4b7615dd26b Mon Sep 17 00:00:00 2001
+From 6660a7217a5b429e5aa5c186e9f71c0fda561660 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Tue, 17 Jul 2018 01:27:15 -0400
Subject: [PATCH] Add Material Tags
@@ -536,10 +536,10 @@ index 000000000..92bb0aef5
+}
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..01cf1041e
+index 000000000..328c51471
--- /dev/null
+++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
+ */
@@ -547,6 +547,7 @@ index 000000000..01cf1041e
+package com.destroystokyo.paper;
+
+import org.bukkit.Bukkit;
++import org.bukkit.TestServer;
+import org.junit.Test;
+
+import java.util.logging.Level;
@@ -555,6 +556,7 @@ index 000000000..01cf1041e
+ @Test
+ public void testInitialize() {
+ try {
++ TestServer.getInstance();
+ MaterialTags.SHULKER_BOXES.getValues();
+ assert true;
+ } catch (Throwable e) {