From 496156e2eff4ec5a47aaf174cb1a04fd90612fde Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 13 Aug 2023 17:41:18 -0700
Subject: Update with latest upstream changes

---
 patches/server/0002-Remap-fixes.patch | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'patches/server/0002-Remap-fixes.patch')

diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch
index fc4f1507e0..52727ae47e 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/server/0002-Remap-fixes.patch
@@ -104,7 +104,7 @@ index ad52c3fc6210939a39ef77a382c640a24ee44838..6b7dd01778f0a5d3a96d2d04af4b525d
      }
  }
 diff --git a/src/test/java/org/bukkit/RegistryConstantsTest.java b/src/test/java/org/bukkit/RegistryConstantsTest.java
-index 569aa9caac8407b52214dbec564dc8e9f08cacc9..c20fc9466649f16f1102978590780bb729c55bc9 100644
+index 179c56181b4f1a8b3b138248450e31b0c7816f97..c4cf1462c2d4d4dd969fb1ff82c2ba441497eeff 100644
 --- a/src/test/java/org/bukkit/RegistryConstantsTest.java
 +++ b/src/test/java/org/bukkit/RegistryConstantsTest.java
 @@ -4,7 +4,7 @@ import java.lang.reflect.Field;
@@ -132,15 +132,6 @@ index 569aa9caac8407b52214dbec564dc8e9f08cacc9..c20fc9466649f16f1102978590780bb7
          this.testMissingConstants(TrimPattern.class, Registries.TRIM_PATTERN);
      }
  
-@@ -169,7 +169,7 @@ public class RegistryConstantsTest extends AbstractTestingBase {
-         this.testMissingConstants(MusicInstrument.class, Registries.INSTRUMENT);
-     }
- 
--    private <T extends Keyed> void testExcessConstants(Class<T> clazz, Registry<T> registry) {
-+    private <T extends Keyed> void testExcessConstants(Class<T> clazz, Registry<T> registry) { // Paper - remap fix
-         List<NamespacedKey> excessKeys = new ArrayList<>();
- 
-         for (Field field : clazz.getFields()) {
 @@ -198,10 +198,10 @@ public class RegistryConstantsTest extends AbstractTestingBase {
          Assert.assertTrue(excessKeys.size() + " excess constants(s) in " + clazz.getSimpleName() + " that do not exist: " + excessKeys, excessKeys.isEmpty());
      }
-- 
cgit v1.2.3