Skip to content

Fix spectral anvil undo refund 修复幻灵铁砧撤销返还 #5134

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
PigeonNian merged 1 commit into from
Oct 2, 2026
Merged

Fix spectral anvil undo refund 修复幻灵铁砧撤销返还 #5134

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
6 changes: 6 additions & 0 deletions src/main/java/dev/dubhe/anvilcraft/building/BuildingUndoResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import dev.dubhe.anvilcraft.block.UseItemOnBlock;
import dev.dubhe.anvilcraft.block.entity.storage.StorageBlockEntity;
import dev.dubhe.anvilcraft.block.item.LargeCakeBlockItem;
import dev.dubhe.anvilcraft.entity.FallingSpectralBlockEntity;
import dev.dubhe.anvilcraft.init.block.ModBlocks;
import net.minecraft.core.BlockPos;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.Registries;
Expand Down Expand Up @@ -150,6 +152,10 @@ void entity(ServerLevel level, CompoundTag data, ItemStack supplied) {
if (plan.unsupported()) throw new IllegalArgumentException("Unknown entity resources");
if (probe instanceof Mob && plan.material().isEmpty()) throw new IllegalArgumentException("Missing creature material");
ItemStack material = supplied.isEmpty() ? plan.material().copy() : supplied.copyWithCount(1);
if (probe instanceof FallingSpectralBlockEntity falling && falling.getBlockState().is(ModBlocks.SPECTRAL_ANVIL)
&& (!copy.contains("Ghost") || copy.getBoolean("Ghost")) && !falling.dropItem) {
material = ItemStack.EMPTY;
}
if (!material.isEmpty() && !(probe instanceof ItemEntity)) {
if (probe.getCustomName() == null) material.remove(DataComponents.CUSTOM_NAME);
else material.set(DataComponents.CUSTOM_NAME, probe.getCustomName());
Expand Down
Loading