Merge branch '1.20' into 1.20.4

ModFest · Jan 25, 2024 · 7173a95 · 7173a95
2 parents 8eb6b2c + e79d438
commit 7173a95
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...ain/java/dev/hephaestus/glowcase/client/render/block/entity/BakedBlockEntityRenderer.java b/...ain/java/dev/hephaestus/glowcase/client/render/block/entity/BakedBlockEntityRenderer.java
@@ -264,7 +264,9 @@ public static void render(WorldRenderContext wrc) {
 				MatrixStack matrices = wrc.matrixStack();
 				matrices.push();
 				matrices.translate(-cam.x, -cam.y, -cam.z);
-				for (Map.Entry<RenderRegionPos, RegionBuffer> entry : regions.object2ReferenceEntrySet()) {
+				var iter = regions.object2ReferenceEntrySet().iterator();
+				while (iter.hasNext()) {
+					var entry = iter.next();
 					RenderRegionPos rrp = entry.getKey();
 					RegionBuffer regionBuffer = entry.getValue();
 					if (isVisiblePos(entry.getKey(), cam)) {
@@ -276,7 +278,7 @@ public static void render(WorldRenderContext wrc) {
 						matrices.pop();
 					} else {
 						regionBuffer.release();
-						regions.remove(rrp);
+						iter.remove();
 					}
 				}
 				RenderSystem.setShaderFogEnd(originalFogEnd);