Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.20

CyclopsMC · Aug 4, 2023 · 7efcaed · 7efcaed
2 parents 75e6ce8 + a442962
commit 7efcaed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/resources/changelog/1.19.2-1.18.7.txt b/resources/changelog/1.19.2-1.18.7.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+
+Fixes:
+* Fix capabilities baking multiple times, #177
+
diff --git a/...in/java/org/cyclops/cyclopscore/modcompat/capabilities/CapabilityConstructorRegistry.java b/...in/java/org/cyclops/cyclopscore/modcompat/capabilities/CapabilityConstructorRegistry.java
@@ -239,8 +239,10 @@ protected <K, V> void onLoad(Map<Class<? extends K>, List<ICapabilityConstructor
                                  @Nullable Map<? extends K, List<ICapabilityConstructor<?, ? extends K, ? extends V>>> allInstanceConstructors,
                                  K keyObject, V valueObject, AttachCapabilitiesEvent<?> event, Class<? extends K> baseClass) {
         boolean initialized = baked || MinecraftHelpers.isMinecraftInitialized();
-        if (!baked && MinecraftHelpers.isMinecraftInitialized()) {
-            bake();
+        synchronized (this) {
+            if (!baked && MinecraftHelpers.isMinecraftInitialized()) {
+                bake();
+            }
         }
 
         // Normal constructors