Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-12-19 16:28:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix npe in mapping loading

Browse Source
This commit is contained in:
KennyTV 2020-04-09 16:40:46 +02:00
parent b8dde25f3a
commit 6ab2e2f0b2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java
View File

@ -67,9 +67,10 @@ public class VBMappingDataLoader {
String diffValue = diffValueJson != null ? diffValueJson.getAsString() : null; String diffValue = diffValueJson != null ? diffValueJson.getAsString() : null;
int dataIndex; int dataIndex;
if (diffValue == null && (dataIndex = key.indexOf('[')) != -1) { if (diffValue == null && (dataIndex = key.indexOf('[')) != -1
&& (diffValueJson = diffIdentifiers.getAsJsonPrimitive(key.substring(0, dataIndex))) != null) {
// Check for wildcard mappings // Check for wildcard mappings
diffValue = diffIdentifiers.getAsJsonPrimitive(key.substring(0, dataIndex)).getAsString(); diffValue = diffValueJson.getAsString();
// Keep original properties if value ends with [ // Keep original properties if value ends with [
if (diffValue.endsWith("[")) { if (diffValue.endsWith("[")) {

3
core/src/main/resources/assets/viabackwards/data/mapping-1.13.2to1.14.json
View File

@ -350,7 +350,8 @@
"minecraft:polished_andesite_slab": "minecraft:stone_brick_slab[", "minecraft:polished_andesite_slab": "minecraft:stone_brick_slab[",
"minecraft:diorite_slab": "minecraft:quartz_slab[", "minecraft:diorite_slab": "minecraft:quartz_slab[",
"minecraft:brick_wall": "minecraft:cobblestone_wall[", "minecraft:brick_wall": "minecraft:cobblestone_wall[",
"minecraft:prismarine_wall": "minecraft:cobblestone_wall[", "minecraft:prismarine_wall": "minecraft:cobblestone_wall[",
"minecraft:sandstone_wall": "minecraft:cobblestone_wall[",
"minecraft:red_sandstone_wall": "minecraft:cobblestone_wall[", "minecraft:red_sandstone_wall": "minecraft:cobblestone_wall[",
"minecraft:mossy_stone_brick_wall": "minecraft:mossy_cobblestone_wall[", "minecraft:mossy_stone_brick_wall": "minecraft:mossy_cobblestone_wall[",
"minecraft:granite_wall": "minecraft:cobblestone_wall[", "minecraft:granite_wall": "minecraft:cobblestone_wall[",