From 5b6445aaaf0d4d5c7170652a1e3de9ace8d5f32e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 5 Dec 2021 15:10:39 +0000 Subject: [PATCH] Revert "fix NPE from changes in e4358b82171" This reverts commit b4192fd8e66604c5edcc4a7c9692107991962c7b. --- ...-fix-NPE-from-changes-in-e4358b82171.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 patches/api/0346-fix-NPE-from-changes-in-e4358b82171.patch diff --git a/patches/api/0346-fix-NPE-from-changes-in-e4358b82171.patch b/patches/api/0346-fix-NPE-from-changes-in-e4358b82171.patch deleted file mode 100644 index c8a90b8b38..0000000000 --- a/patches/api/0346-fix-NPE-from-changes-in-e4358b82171.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gabriel Wolf -Date: Sun, 5 Dec 2021 14:36:05 +0000 -Subject: [PATCH] fix NPE from changes in e4358b82171 - - -diff --git a/src/main/java/org/bukkit/configuration/MemorySection.java b/src/main/java/org/bukkit/configuration/MemorySection.java -index 09f1debef5fad469a05a0d97b740a7310890fd64..9949fdd139709b42f8e3321b155c6980b177c2a4 100644 ---- a/src/main/java/org/bukkit/configuration/MemorySection.java -+++ b/src/main/java/org/bukkit/configuration/MemorySection.java -@@ -251,7 +251,12 @@ public class MemorySection implements ConfigurationSection { - int i1 = -1, i2; - ConfigurationSection section = this; - while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) { -- if (section == null || !section.contains(path.substring(i2, i1), true)) { -+ final String currentPath = path.substring(i2, i1); -+ if (!section.contains(currentPath, true)) { -+ return def; -+ } -+ section = section.getConfigurationSection(currentPath); -+ if(section == null) { - return def; - } - section = section.getConfigurationSection(path.substring(i2, i1));