Skip to content

Reuse already calculated tags #736

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

Merged
TylerS1066 merged 1 commit into from
Mar 16, 2025
Merged

Reuse already calculated tags #736

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
17 changes: 2 additions & 15 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 @@ -130,25 +130,12 @@ public void onCraftStatusUpdate(@NotNull CraftStatusUpdateEvent e) {

boolean sinking = false;
boolean disabled = false;
Counter<Material> materials = craft.getDataTag(Craft.MATERIALS);
int nonNegligibleBlocks = craft.getDataTag(Craft.NON_NEGLIGIBLE_BLOCKS);
int nonNegligibleSolidBlocks = craft.getDataTag(Craft.NON_NEGLIGIBLE_SOLID_BLOCKS);

// Build up counters of the fly and move blocks
Counter<RequiredBlockEntry> flyBlocks = new Counter<>();
flyBlocks.putAll(craft.getType().getRequiredBlockProperty(CraftType.FLY_BLOCKS));
Counter<RequiredBlockEntry> moveBlocks = new Counter<>();
moveBlocks.putAll(craft.getType().getRequiredBlockProperty(CraftType.MOVE_BLOCKS));
for (Material m : materials.getKeySet()) {
for (RequiredBlockEntry entry : flyBlocks.getKeySet()) {
if(entry.contains(m))
flyBlocks.add(entry, materials.get(m));
}
for (RequiredBlockEntry entry : moveBlocks.getKeySet()) {
if(entry.contains(m))
moveBlocks.add(entry, materials.get(m));
}
}
Counter<RequiredBlockEntry> flyBlocks = craft.getDataTag(Craft.FLYBLOCKS);
Counter<RequiredBlockEntry> moveBlocks = craft.getDataTag(Craft.MOVEBLOCKS);

// now see if any of the resulting percentages are below the threshold specified in sinkPercent
double sinkPercent = craft.getType().getDoubleProperty(CraftType.SINK_PERCENT) / 100.0;
Expand Down