Skip to content

Commit 5cd7f36

Browse files
committed
fix null value being returned
1 parent fd995f1 commit 5cd7f36

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/main/java/com/falsepattern/chunk/internal/ChunkDataRegistryImpl.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,21 @@ private static NBTTagCompound createManagerNBT(boolean privileged, NBTTagCompoun
160160
return root;
161161
}
162162
val domain = manager.domain();
163+
val id = manager.id();
163164
NBTTagCompound domainNBT;
164165
if (root.hasKey(domain)) {
166+
domainNBT = root.getCompoundTag(domain);
167+
} else {
165168
domainNBT = new NBTTagCompound();
166169
root.setTag(domain, domainNBT);
170+
}
171+
if (domainNBT.hasKey(id)) {
172+
return domainNBT.getCompoundTag(id);
167173
} else {
168-
domainNBT = root.getCompoundTag(domain);
174+
val subNBT = new NBTTagCompound();
175+
domainNBT.setTag(id, subNBT);
176+
return subNBT;
169177
}
170-
val subNBT = new NBTTagCompound();
171-
domainNBT.setTag(manager.id(), subNBT);
172-
return subNBT;
173178
}
174179

175180
private static NBTTagCompound getManagerNBT(boolean privileged, NBTTagCompound root, ChunkDataManager manager) {
@@ -178,11 +183,11 @@ private static NBTTagCompound getManagerNBT(boolean privileged, NBTTagCompound r
178183
}
179184
val domain = manager.domain();
180185
if (!root.hasKey(domain)) {
181-
return null;
186+
return new NBTTagCompound();
182187
}
183188
val domainNBT = root.getCompoundTag(domain);
184189
if (!domainNBT.hasKey(manager.id())) {
185-
return null;
190+
return new NBTTagCompound();
186191
}
187192
return domainNBT.getCompoundTag(manager.id());
188193
}

0 commit comments

Comments
 (0)