Skip to content

Fix moveblocks #748

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
DerToaster98 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix moveblocks #748

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a4aa0e
Merge pull request #31 from APDevTeam/main
DerToaster98 Jun 18, 2025
18c316d
fix moveblocks being ignored if there are no moveblocks aboard
DerToaster98 Jun 18, 2025
9244e95
implement more elegant solution => prefill all moveblock properties i…
DerToaster98 Jun 18, 2025
43bdf5f
dont create a new object, re-use the existing ones
DerToaster98 Jun 18, 2025
96dea88
Revert "dont create a new object, re-use the existing ones"
DerToaster98 Jun 18, 2025
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
15 changes: 12 additions & 3 deletions Movecraft/src/main/java/net/countercraft/movecraft/features/status/StatusManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ private StatusUpdateTask(@NotNull Craft craft) {

Counter<RequiredBlockEntry> flyblocks = new Counter<>();
Counter<RequiredBlockEntry> moveblocks = new Counter<>();

// Pre-fill the moveblocks counter to avoid ignoring moveblocks
for(RequiredBlockEntry entry : craft.getType().getRequiredBlockProperty(CraftType.MOVE_BLOCKS)) {
moveblocks.add(entry, 0);
}

for(Material material : materials.getKeySet()) {
for(RequiredBlockEntry entry : craft.getType().getRequiredBlockProperty(CraftType.FLY_BLOCKS)) {
if(entry.contains(material)) {
Expand Down Expand Up @@ -143,9 +149,12 @@ public void onCraftStatusUpdate(@NotNull CraftStatusUpdateEvent e) {
if(!entry.check(flyBlocks.get(entry), nonNegligibleBlocks, sinkPercent))
sinking = true;
}
for (RequiredBlockEntry entry : moveBlocks.getKeySet()) {
if (!entry.check(moveBlocks.get(entry), nonNegligibleBlocks, sinkPercent))
disabled = true;
// If the craft has MOveblocks defined, then validate them, if there are any aboard
if (craft.getType().getRequiredBlockProperty(CraftType.MOVE_BLOCKS).size() > 0) {
for (RequiredBlockEntry entry : moveBlocks.getKeySet()) {
if (!entry.check(moveBlocks.get(entry), nonNegligibleBlocks, sinkPercent))
disabled = true;
}
}

// And check the OverallSinkPercent
Expand Down