Merge pull request #673 from P3pp3rF1y/1.20.4-dev

fix: 🐛 Fix crash with mob charm code when there are multiple players …
P3pp3rF1y · Apr 7, 2024 · b3f4ca0 · b3f4ca0
2 parents 1ecc3c2 + 058a2f5
commit b3f4ca0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ loader_version_range=[2,)
 mod_id=reliquary
 mod_name=Reliquary
 mod_license=GNU General Public License v3.0
-mod_version=2.0.40
+mod_version=2.0.41
 mod_group_id=reliquary
 mod_authors=x3n0ph0b3, TheMike, P3pp3rF1y
 mod_description=Two words: magical swag. Oh, and a gun.

diff --git a/src/main/java/reliquary/items/MobCharmItem.java b/src/main/java/reliquary/items/MobCharmItem.java
@@ -215,8 +215,8 @@ public void setCharmInventoryHandler(CharmInventoryHandler charmInventoryHandler
 	}
 
 	public static class CharmInventoryHandler {
-		private static long lastCharmCacheTime = -1;
-		private static final Map<UUID, Set<String>> charmsInInventoryCache = new HashMap<>();
+		private long lastCharmCacheTime = -1;
+		private final Map<UUID, Set<String>> charmsInInventoryCache = new HashMap<>();
 
 		protected Set<String> getCharmRegistryNames(Player player) {
 			Set<String> ret = new HashSet<>();
@@ -240,9 +240,8 @@ public boolean playerHasMobCharm(Player player, MobCharmDefinition charmDefiniti
 			if (lastCharmCacheTime != player.level().getGameTime()) {
 				lastCharmCacheTime = player.level().getGameTime();
 				charmsInInventoryCache.clear();
-				charmsInInventoryCache.put(player.getUUID(), getCharmRegistryNames(player));
 			}
-			return charmsInInventoryCache.get(player.getUUID()).contains(registryName);
+			return charmsInInventoryCache.computeIfAbsent(player.getUUID(), u -> getCharmRegistryNames(player)).contains(registryName);
 		}
 
 		public boolean damagePlayersMobCharm(ServerPlayer player, String entityRegistryName) {