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

Fix #53 and #54

Browse source
This commit is contained in:
Runemoro 2018-04-18 19:21:10 -04:00
parent c7285491b9
commit 32f77b8b9d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/dimdev/ddutils/schem/Schematic.java
View file

@ -403,7 +403,7 @@ public class Schematic {
for (int cubeZ = 0; cubeZ <= (length >> 4) + 1; cubeZ++) { for (int cubeZ = 0; cubeZ <= (length >> 4) + 1; cubeZ++) {
long setStart = System.nanoTime(); long setStart = System.nanoTime();
// Get the cube only once for efficiency // Get the cube only once for efficiency
Cube cube = cubicWorld.getCubeFromCubeCoords((xBase << 4) + cubeX, (yBase << 4) + cubeY, (zBase << 4) + cubeZ); Cube cube = cubicWorld.getCubeFromCubeCoords((xBase >> 4) + cubeX, (yBase >> 4) + cubeY, (zBase >> 4) + cubeZ);
ExtendedBlockStorage storage = cube.getStorage(); ExtendedBlockStorage storage = cube.getStorage();
boolean setAir = storage != null; boolean setAir = storage != null;
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
@ -456,7 +456,7 @@ public class Schematic {
IBlockState state = palette.get(blockData[sx][sy][sz]); IBlockState state = palette.get(blockData[sx][sy][sz]);
if (!state.getBlock().equals(Blocks.AIR)) { if (!state.getBlock().equals(Blocks.AIR)) {
if (storage == null) { if (storage == null) {
storage = new ExtendedBlockStorage(((yBase >> 4) + storageY) << 4, world.provider.hasSkyLight()); storage = new ExtendedBlockStorage((yBase >> 4) + storageY << 4, world.provider.hasSkyLight());
storageArray[(yBase >> 4) + storageY] = storage; storageArray[(yBase >> 4) + storageY] = storage;
} }
storage.set(x, y, z, state); storage.set(x, y, z, state);

1
src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFabricEternal.java
View file

@ -32,6 +32,7 @@ public class BlockFabricEternal extends BlockEmptyDrops { // TODO: make this a g
@Override @Override
public void onEntityWalk(World world, BlockPos pos, Entity entity) { public void onEntityWalk(World world, BlockPos pos, Entity entity) {
if (world.isRemote) return;
exitLimbo.receiveEntity(entity, entity.rotationYaw / 90 * 90, 0); exitLimbo.receiveEntity(entity, entity.rotationYaw / 90 * 90, 0);
} }
} }