Skip to content

Undo imp #807

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
Raycoms merged 3 commits into from
Jan 5, 2026
+5 −6
Merged

Undo imp #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e564ab0
Improve undo to only skip on wrong block instead of blockstate
someaddons Jan 4, 2026
ec2ed4d
add DO compat
someaddons Jan 4, 2026
efa7e81
Fix itemstorage hash
someaddons Jan 4, 2026
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
4 changes: 1 addition & 3 deletions src/api/java/com/ldtteam/structurize/api/util/ItemStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,7 @@ public boolean ignoreNBTValue()
@Override
public int hashCode()
{
return Objects.hash(stack.getItem())
+ (this.shouldIgnoreDamageValue ? 0 : (this.stack.getDamageValue() * 31))
+ (this.shouldIgnoreNBTValue ? 0 : ((this.stack.serializeNBT() == null) ? 0 : this.stack.serializeNBT().hashCode()));
return Objects.hash(stack.getItem());
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/ldtteam/structurize/util/ChangeStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.ldtteam.structurize.Structurize;
import com.ldtteam.structurize.management.Manager;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -128,7 +128,8 @@ public boolean undo(final Level world, @Nullable final ChangeStorage undoStorage
{
final Map.Entry<BlockPos, BlockChangeData> entry = iterator.next();
// Only revert block changes which this operation caused
if (world.getBlockState(entry.getKey()) != entry.getValue().getPostState())
if (world.getBlockState(entry.getKey()).getBlock() != entry.getValue().getPostState().getBlock()
|| entry.getValue().getPostTE() != world.getBlockEntity(entry.getKey()))
Copy link
Contributor

@Raycoms Raycoms Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the TE reference check?

{
continue;
}
Expand Down