Skip to content

Fix Proposal for #9214 #9399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: mc1.20.1/dev
Choose a base branch
from
Open

Fix Proposal for #9214 #9399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main/java/com/simibubi/create/content/contraptions/Contraption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down Expand Up @@ -182,7 +184,7 @@ public abstract class Contraption {
protected ContraptionWorld collisionLevel;

public Contraption() {
blocks = new HashMap<>();
blocks = new LinkedHashMap<>();
updateTags = new HashMap<>();
isLegacy = new Object2BooleanArrayMap<>();
seats = new ArrayList<>();
Expand Down Expand Up @@ -1005,6 +1007,12 @@ private static StructureBlockInfo legacyReadStructureBlockInfo(CompoundTag block
}

public void removeBlocksFromWorld(Level world, BlockPos offset) {
// Invert order of the blocks LinkedHashMap, so all posterior iterations are inverted
List<Map.Entry<BlockPos, StructureBlockInfo>> entries = new ArrayList<>(blocks.entrySet());
Collections.reverse(entries);
blocks.clear();
entries.forEach(e -> blocks.put(e.getKey(), e.getValue()));

glueToRemove.forEach(glue -> {
superglue.add(glue.getBoundingBox()
.move(Vec3.atLowerCornerOf(offset.offset(anchor))
Expand Down