Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bandaid fix

Browse source
This commit is contained in:
CreepyCre 2021-02-22 21:11:47 +01:00
parent c1dd774b2f
commit c65fd8af66
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/dimdev/dimdoors/command/SchematicV2Command.java
View file

@ -45,7 +45,8 @@ public class SchematicV2Command {
SchematicPlacer.place(
Schematic.fromTag(NbtIo.readCompressed(in)),
ctx.getSource().getWorld(),
ctx.getSource().getPlayer().getBlockPos()
ctx.getSource().getPlayer().getBlockPos(),
false
);
} catch (IOException e) {
e.printStackTrace();

2
src/main/java/org/dimdev/dimdoors/world/feature/gateway/schematic/SchematicV2Gateway.java
View file

@ -59,7 +59,7 @@ public abstract class SchematicV2Gateway implements Gateway, BiPredicate<Structu
TemplateUtils.replacePlaceholders(this.schematic, world);
this.replaced = true;
}
SchematicPlacer.place(this.schematic, world, pos);
SchematicPlacer.place(this.schematic, world, pos, false);
this.generateRandomBits(world, pos);
}

6
src/main/schematics/org/dimdev/dimdoors/util/schematic/v2/RelativeBlockSample.java
View file

@ -99,11 +99,13 @@ public class RelativeBlockSample implements BlockView, ModifiableWorld {
return this.blockContainer.get(pos).getFluidState();
}
public void place(BlockPos origin, ServerWorld world, boolean blockUpdate, boolean biomes) {
public void place(BlockPos origin, StructureWorldAccess world, boolean blockUpdate, boolean biomes) {
if (!(world instanceof ServerWorld)) blockUpdate = false;
boolean finalBlockUpdate = blockUpdate;
this.blockContainer.forEach((pos, state) -> {
BlockPos actualPos = origin.add(pos);
world.setBlockState(actualPos, state, 0, 0);
if (blockUpdate) world.getChunkManager().markForUpdate(actualPos);
if (finalBlockUpdate) ((ServerWorld) world).getChunkManager().markForUpdate(actualPos);
});
for (Map.Entry<BlockPos, CompoundTag> entry : this.blockEntityContainer.entrySet()) {
BlockPos pos = entry.getKey();

2
src/main/schematics/org/dimdev/dimdoors/util/schematic/v2/SchematicPlacer.java
View file

@ -27,7 +27,7 @@ public final class SchematicPlacer {
private SchematicPlacer() {
}
public static void place(Schematic schematic, ServerWorld world, BlockPos origin, boolean blockUpdate) {
public static void place(Schematic schematic, StructureWorldAccess world, BlockPos origin, boolean blockUpdate) {
LOGGER.debug("Placing schematic: {}", schematic.getMetadata().getName());
for (String id : schematic.getMetadata().getRequiredMods()) {
if (!FabricLoader.getInstance().isModLoaded(id)) {

2
src/main/schematics/org/dimdev/dimdoors/util/schematic/v2/WorldlyBlockSample.java
View file

@ -24,7 +24,7 @@ public class WorldlyBlockSample implements BlockView, ModifiableTestableWorld {
}
public void place(BlockPos origin, boolean biomes) {
this.relativeBlockSample.place(origin, this.world, biomes);
this.relativeBlockSample.place(origin, this.world, false, biomes);
}
@Nullable