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

Fix rift not being placed when bottom door block is broken

Browse source
This commit is contained in:
Runemoro 2018-01-06 12:05:51 -05:00
parent a18b498804
commit bbfd3bc2c6
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/org/dimdev/dimdoors/shared/blocks/BlockDimensionalDoor.java
View file

@ -1,14 +1,9 @@
package org.dimdev.dimdoors.shared.blocks;
import java.util.Random;
import net.minecraft.block.state.BlockFaceShape;
import org.dimdev.dimdoors.shared.rifts.RiftRegistry;
import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift;
import org.dimdev.dimdoors.shared.tileentities.TileEntityFloatingRift;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -19,6 +14,11 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.dimdev.dimdoors.shared.rifts.RiftRegistry;
import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift;
import org.dimdev.dimdoors.shared.tileentities.TileEntityFloatingRift;
import java.util.Random;
public abstract class BlockDimensionalDoor extends BlockDoor implements IRiftProvider<TileEntityEntranceRift> {
@ -39,7 +39,8 @@ public abstract class BlockDimensionalDoor extends BlockDoor implements IRiftPro
boolean successful = rift.teleport(entity);
if (successful) entity.timeUntilPortal = 0; // Allow the entity to teleport if successful
if (successful && entity instanceof EntityPlayer) {
if (!state.getValue(POWERED)) toggleDoor(world, pos, false); // TODO: config option playerClosesDoorBehind
if (!state.getValue(POWERED))
toggleDoor(world, pos, false); // TODO: config option playerClosesDoorBehind
if (rift.isCloseAfterPassThrough()) world.destroyBlock(pos, false);
}
}
@ -129,7 +130,7 @@ public abstract class BlockDimensionalDoor extends BlockDoor implements IRiftPro
super.breakBlock(world, pos, state);
if (world.isRemote) return;
if (rift.isPlaceRiftOnBreak() || rift.isRegistered() && RiftRegistry.getRiftInfo(rift.getLocation()).getSources().size() > 0 && !rift.isAlwaysDelete()) {
world.setBlockState(pos, ModBlocks.RIFT.getDefaultState());
world.setBlockState(rift.getPos(), ModBlocks.RIFT.getDefaultState());
TileEntityFloatingRift newRift = (TileEntityFloatingRift) world.getTileEntity(pos);
newRift.copyFrom(rift);
newRift.updateAvailableLinks();
@ -138,6 +139,9 @@ public abstract class BlockDimensionalDoor extends BlockDoor implements IRiftPro
}
}
// Let vanilla handle breaking the block. If we break it here, the rift we place will later be broken.
@Override public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) {}
@Override
public TileEntityEntranceRift getRift(World world, BlockPos pos, IBlockState state) {
if (state.getValue(BlockDoor.HALF) == EnumDoorHalf.LOWER) {

2
src/main/java/org/dimdev/dimdoors/shared/pockets/Pocket.java
View file

@ -149,7 +149,7 @@ import net.minecraft.util.math.BlockPos;
public BlockPos getOrigin() {
int gridSize = PocketRegistry.getForDim(dim).getGridSize();
return new BlockPos(x * gridSize, 0, z * gridSize); // TODO: configurable yBase?
return new BlockPos(x * gridSize * 16, 0, z * gridSize * 16); // TODO: configurable yBase?
}
// TODO: method to erase a pocket