diff --git a/changelog.md b/changelog.md index 3a067fcee..4da61619d 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1,3 @@ -- fixed compatibility crash related to Soul Jar (reported by @π™Ώπ™°πš‡πš‡) \ No newline at end of file +- fixed compatibility crash related to Soul Jar (reported by @π™Ώπ™°πš‡πš‡) +- fixed compatibility error when reloading resources (reported by @SettingDust) +- fixed compatibility crash with Randomium (reported by @Doom, @ZacGames, @AllyJaxx) \ No newline at end of file diff --git a/common/src/main/java/com/majruszsdifficulty/itemsets/ItemSet.java b/common/src/main/java/com/majruszsdifficulty/itemsets/ItemSet.java index ea1ea36c0..d5ec8d211 100644 --- a/common/src/main/java/com/majruszsdifficulty/itemsets/ItemSet.java +++ b/common/src/main/java/com/majruszsdifficulty/itemsets/ItemSet.java @@ -66,7 +66,8 @@ public List< ItemSetRequirement > findRequirementsMet( LivingEntity entity ) { private ItemSet() { Side.runOnClient( ()->()->{ OnItemTooltip.listen( data->Client.addTooltip( data, this ) ) - .addCondition( data->this.requirements.stream().anyMatch( requirement->requirement.is( data.itemStack ) ) ); + .addCondition( data->this.requirements.stream().anyMatch( requirement->requirement.is( data.itemStack ) ) ) + .addCondition( data->Side.getLocalPlayer() != null /* compatibility check */ ); } ); }