Skip to content

Commit faf7313

Browse files
author
CoolLoong
committed
fix: memory leak
1 parent 5e67e01 commit faf7313

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

src/main/java/cn/nukkit/blockstate/BlockStateRegistry.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,12 @@ public Registration getRegistration(BlockState state) {
280280
static Map<String, String> extraMappings = new HashMap<>();
281281

282282
static {
283-
extraMappings.put("17:4", "minecraft:acacia;pillar_axis=y");
284-
extraMappings.put("17:12", "minecraft:acacia;pillar_axis=x");
285-
extraMappings.put("17:20", "minecraft:acacia;pillar_axis=z");
286-
extraMappings.put("17:5", "minecraft:dark_oak;pillar_axis=y");
287-
extraMappings.put("17:13", "minecraft:dark_oak;pillar_axis=x");
288-
extraMappings.put("17:21", "minecraft:dark_oak;pillar_axis=z");
283+
extraMappings.put("17:4", "minecraft:acacia_log;pillar_axis=y");
284+
extraMappings.put("17:12", "minecraft:acacia_log;pillar_axis=x");
285+
extraMappings.put("17:20", "minecraft:acacia_log;pillar_axis=z");
286+
extraMappings.put("17:5", "minecraft:dark_oak_log;pillar_axis=y");
287+
extraMappings.put("17:13", "minecraft:dark_oak_log;pillar_axis=x");
288+
extraMappings.put("17:21", "minecraft:dark_oak_log;pillar_axis=z");
289289
}
290290

291291
private Registration findRegistration(final BlockState state) {

src/main/java/cn/nukkit/convert/task/ConvertTask.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ protected boolean exec() {
4141
if (regionLoader.chunkExists(i, j)) {
4242
try {
4343
Chunk chunk = (Chunk) regionLoader.readChunk(i, j);
44-
chunk.initChunk();
45-
levelDBStorage.writeChunk(chunk, dimensionData);
44+
if (chunk != null) {
45+
chunk.initChunk();
46+
levelDBStorage.writeChunk(chunk, dimensionData);
47+
}
48+
chunk = null;
4649
} catch (IOException e) {
4750
throw new RuntimeException(e);
4851
}
@@ -51,6 +54,11 @@ protected boolean exec() {
5154
}
5255
}
5356
} // progress bar stops automatically after completion of try-with-resource block
57+
try {
58+
regionLoader.close();
59+
} catch (IOException e) {
60+
throw new RuntimeException(e);
61+
}
5462
return true;
5563
}
5664
}

src/main/java/cn/nukkit/item/RuntimeItemMapping.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ public int getNetworkId(Item item) {
302302
runtimeEntry = legacy2Runtime.get(RuntimeItems.getFullId(item.getId(), 0));
303303
}
304304
if (runtimeEntry == null) {
305-
throw new IllegalArgumentException("Unknown item mapping " + item);
305+
log.warn("Unknown item mapping " + item);
306+
return item.getId();
306307
}
307308
return runtimeEntry.runtimeId;
308309
}

0 commit comments

Comments
 (0)