PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-03-03 16:51:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed uncaught exception when loading trait maps

Browse source
This commit is contained in:
Sollace 2021-11-13 23:07:10 +02:00
parent 2f1d473262
commit aed4efcbbe
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitLoader.java
View file

@ -8,6 +8,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import com.google.gson.JsonParseException;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.util.Resources; import com.minelittlepony.unicopia.util.Resources;
@ -75,7 +76,7 @@ public class TraitLoader extends SinglePreparationResourceReloader<Map<Identifie
} }
} }
} catch (IOException e) { } catch (IOException | JsonParseException e) {
} finally { } finally {
profiler.pop(); profiler.pop();
} }

2
src/main/resources/data/minecraft/traits/items.json
View file

@ -265,7 +265,7 @@
"minecraft:music_disc_stal": "", "minecraft:music_disc_stal": "",
"minecraft:music_disc_strad": "", "minecraft:music_disc_strad": "",
"minecraft:music_disc_ward": "", "minecraft:music_disc_ward": "",
"minecraft:music_disc_": "",11 "minecraft:music_disc_11": "",
"minecraft:music_disc_wait": "", "minecraft:music_disc_wait": "",
"minecraft:music_disc_pigstep": "", "minecraft:music_disc_pigstep": "",
"minecraft:trident": "", "minecraft:trident": "",