From 1f46b087426d212757d9b62e7dace73d636c96a8 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 28 Oct 2023 23:18:32 +0100 Subject: [PATCH 1/2] Fixed the recipe for the inferno spell --- src/main/resources/data/unicopia/recipes/spells/infernal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/data/unicopia/recipes/spells/infernal.json b/src/main/resources/data/unicopia/recipes/spells/infernal.json index 6fd8f130..9f2c8995 100644 --- a/src/main/resources/data/unicopia/recipes/spells/infernal.json +++ b/src/main/resources/data/unicopia/recipes/spells/infernal.json @@ -2,7 +2,7 @@ "type": "unicopia:spellbook/crafting", "material": { "item": "unicopia:gemstone", "spell": "unicopia:none" }, "traits": { - "fire": 50, "dark": 10 + "fire": 50, "darkness": 10 }, "ingredients": [ { "item": "unicopia:gemstone", "spell": "unicopia:flame" } From b59c765197a2c1346ac8beac5c1837c4cb74e179 Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 30 Oct 2023 22:00:19 +0000 Subject: [PATCH 2/2] Catch exceptions when tearing down block entities --- .../unicopia/entity/behaviour/EntityAppearance.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java index 50085cf0..edad3ecb 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java @@ -127,7 +127,9 @@ public class EntityAppearance implements NbtSerialisable, PlayerDimensions.Provi entity = null; } if (blockEntity != null) { - blockEntity.markRemoved(); + try { + blockEntity.markRemoved(); + } catch (Throwable ignored) {} blockEntity = null; } }