OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 15:47:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "fix NPE from changes in e4358b82171"

Browse source 
This reverts commit b4192fd8e6.
This commit is contained in:
Shane Freeder 2021-12-05 15:10:39 +00:00
parent b4192fd8e6
commit 5b6445aaaf
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
1 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
patches/api/0346-fix-NPE-from-changes-in-e4358b82171.patch
View file

@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Gabriel Wolf <gabrielpatrikurban@gmail.com>
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));