Merge remote-tracking branch 'origin/main' into 1.18

This commit is contained in:
embeddedt 2023-05-08 14:14:37 -04:00
commit 5b57b238c3
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -433,8 +433,9 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
// use a shared baked missing model
if(bakedMissingModel == null) {
bakedMissingModel = iunbakedmodel.bake((ModelBakery) (Object) this, textureGetter, arg2, arg);
((DynamicBakedModelProvider)this.bakedTopLevelModels).setMissingModel(bakedMissingModel);
}
if(this.bakedTopLevelModels instanceof DynamicBakedModelProvider)
((DynamicBakedModelProvider)this.bakedTopLevelModels).setMissingModel(bakedMissingModel);
ibakedmodel = bakedMissingModel;
} else
ibakedmodel = iunbakedmodel.bake((ModelBakery) (Object) this, textureGetter, arg2, arg);