mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-02-06 10:25:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: backtank crashing on ctrl+pick block (#7284)

Browse source
This commit is contained in:
VoidLeech 2025-01-12 22:31:15 +01:00 committed by GitHub
parent 18fb3b4beb
commit 0870d34033
Failed to generate hash of commit
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java
View file

@ -184,8 +184,10 @@ public class BacktankBlock extends HorizontalKineticBlock implements IBE<Backtan
Optional<BacktankBlockEntity> blockEntityOptional = getBlockEntityOptional(blockGetter, pos); Optional<BacktankBlockEntity> blockEntityOptional = getBlockEntityOptional(blockGetter, pos);
CompoundTag forgeCapsTag = blockEntityOptional.map(BacktankBlockEntity::getForgeCapsTag) CompoundTag forgeCapsTag = blockEntityOptional.map(BacktankBlockEntity::getForgeCapsTag)
.map(CompoundTag::copy)
.orElse(null); .orElse(null);
CompoundTag vanillaTag = blockEntityOptional.map(BacktankBlockEntity::getVanillaTag) CompoundTag vanillaTag = blockEntityOptional.map(BacktankBlockEntity::getVanillaTag)
.map(CompoundTag::copy)
.orElse(new CompoundTag()); .orElse(new CompoundTag());
int air = blockEntityOptional.map(BacktankBlockEntity::getAirLevel) int air = blockEntityOptional.map(BacktankBlockEntity::getAirLevel)
.orElse(0); .orElse(0);

6
src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java
View file

@ -183,8 +183,10 @@ public class BacktankBlockEntity extends KineticBlockEntity implements Nameable
} }
public void setTags(CompoundTag vanillaTag, @Nullable CompoundTag forgeCapsTag) { public void setTags(CompoundTag vanillaTag, @Nullable CompoundTag forgeCapsTag) {
this.vanillaTag = vanillaTag; this.vanillaTag = vanillaTag.copy();
this.forgeCapsTag = forgeCapsTag; this.forgeCapsTag = forgeCapsTag == null ? null : forgeCapsTag.copy();
// Prevent nesting of the ctrl+pick block added tag
vanillaTag.remove("BlockEntityTag");
} }
public CompoundTag getVanillaTag() { public CompoundTag getVanillaTag() {