@@ -160,16 +160,21 @@ private static NBTTagCompound createManagerNBT(boolean privileged, NBTTagCompoun
160
160
return root ;
161
161
}
162
162
val domain = manager .domain ();
163
+ val id = manager .id ();
163
164
NBTTagCompound domainNBT ;
164
165
if (root .hasKey (domain )) {
166
+ domainNBT = root .getCompoundTag (domain );
167
+ } else {
165
168
domainNBT = new NBTTagCompound ();
166
169
root .setTag (domain , domainNBT );
170
+ }
171
+ if (domainNBT .hasKey (id )) {
172
+ return domainNBT .getCompoundTag (id );
167
173
} else {
168
- domainNBT = root .getCompoundTag (domain );
174
+ val subNBT = new NBTTagCompound ();
175
+ domainNBT .setTag (id , subNBT );
176
+ return subNBT ;
169
177
}
170
- val subNBT = new NBTTagCompound ();
171
- domainNBT .setTag (manager .id (), subNBT );
172
- return subNBT ;
173
178
}
174
179
175
180
private static NBTTagCompound getManagerNBT (boolean privileged , NBTTagCompound root , ChunkDataManager manager ) {
@@ -178,11 +183,11 @@ private static NBTTagCompound getManagerNBT(boolean privileged, NBTTagCompound r
178
183
}
179
184
val domain = manager .domain ();
180
185
if (!root .hasKey (domain )) {
181
- return null ;
186
+ return new NBTTagCompound () ;
182
187
}
183
188
val domainNBT = root .getCompoundTag (domain );
184
189
if (!domainNBT .hasKey (manager .id ())) {
185
- return null ;
190
+ return new NBTTagCompound () ;
186
191
}
187
192
return domainNBT .getCompoundTag (manager .id ());
188
193
}
0 commit comments