Fixed compatibility error when reloading resources (reported by @Sett…

…ingDust)
Majrusz · Apr 26, 2024 · f097e4a · f097e4a
1 parent 1e868a8
commit f097e4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1 +1,3 @@
-- fixed compatibility crash related to Soul Jar (reported by @𝙿𝙰𝚇𝚇)
+- 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)
diff --git 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 */ );
 		} );
 	}