Merge 1.19.4 into 1.20

This commit is contained in:
embeddedt 2023-07-19 17:01:44 -04:00
commit d69f5ac18d
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -292,7 +292,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
return m;
ModelBakery self = (ModelBakery) (Object) this;
ModelBaker theBaker = self.new ModelBakerImpl(textureGetter, modelLocation);
m = theBaker.bake(modelLocation, state);
synchronized(this) { m = theBaker.bake(modelLocation, state); }
if(m != null)
loadedBakedModels.put(key, m);
return m;