diff options
Diffstat (limited to 'patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch')
| -rw-r--r-- | patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch index 0e609e40fd..781b18ae7a 100644 --- a/patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch +++ b/patches/server/1017-Proxy-ItemStack-to-CraftItemStack.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Proxy ItemStack to CraftItemStack diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index aef5c0d1be9c4aa62d9b7c5cacbb42066a802729..db0fe1b755f59eafca6e57917429fb7889889c3a 100644 +index efb7fb8dbaa7446e394f55b021692c11a25fd29f..a3c6d2cbdce60b1cf935d798568b8bb5d97e1229 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -26,15 +26,57 @@ import org.jetbrains.annotations.ApiStatus; @@ -205,10 +205,10 @@ index 6cc9d7a9e6d4bfdc27e52fc581b2bb832616f121..6930d0afb230a88aa813b02e4d55c95d + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 82ebfd09e9baca0a31ee41c0e5228bce3c54e74f..28dbe30a98a6730839949bc9a6a90b78619ff84d 100644 +index 68a6cd43042e87501f5bd48565222638dd58a1cf..6adc18c40d5d62e2ebc8deec197cec630a366937 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -683,6 +683,13 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -689,6 +689,13 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end - hack to get tags for non server-backed registries @@ -224,7 +224,7 @@ index 82ebfd09e9baca0a31ee41c0e5228bce3c54e74f..28dbe30a98a6730839949bc9a6a90b78 * <p> diff --git a/src/test/java/io/papermc/paper/configuration/ConfigurationSectionTest.java b/src/test/java/io/papermc/paper/configuration/ConfigurationSectionTest.java new file mode 100644 -index 0000000000000000000000000000000000000000..e5c2fb160e9d390cdfa0259a3feb9f488b2dc14d +index 0000000000000000000000000000000000000000..ed45bfa577579afcbd54d655c3b5d05d6c6f3e86 --- /dev/null +++ b/src/test/java/io/papermc/paper/configuration/ConfigurationSectionTest.java @@ -0,0 +1,53 @@ @@ -233,7 +233,7 @@ index 0000000000000000000000000000000000000000..e5c2fb160e9d390cdfa0259a3feb9f48 +import org.bukkit.Material; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.inventory.ItemStack; -+import org.bukkit.support.AbstractTestingBase; ++import org.bukkit.support.environment.VanillaFeature; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; @@ -241,7 +241,7 @@ index 0000000000000000000000000000000000000000..e5c2fb160e9d390cdfa0259a3feb9f48 +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + -+public abstract class ConfigurationSectionTest extends AbstractTestingBase { ++public abstract class ConfigurationSectionTest { + public abstract ConfigurationSection getConfigurationSection(); + + @Test @@ -283,15 +283,17 @@ index 0000000000000000000000000000000000000000..e5c2fb160e9d390cdfa0259a3feb9f48 +} diff --git a/src/test/java/io/papermc/paper/configuration/MemorySectionTest.java b/src/test/java/io/papermc/paper/configuration/MemorySectionTest.java new file mode 100644 -index 0000000000000000000000000000000000000000..def33c36f207a4c5306b5a895336aa70335c1678 +index 0000000000000000000000000000000000000000..c00085328ce8a00fc274632a556ab27660fa57ed --- /dev/null +++ b/src/test/java/io/papermc/paper/configuration/MemorySectionTest.java -@@ -0,0 +1,11 @@ +@@ -0,0 +1,13 @@ +package io.papermc.paper.configuration; + +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.MemoryConfiguration; ++import org.bukkit.support.environment.Normal; + ++@Normal +public class MemorySectionTest extends ConfigurationSectionTest { + @Override + public ConfigurationSection getConfigurationSection() { |