Solid vine and crash fixes for it

This commit is contained in:
Vincent Lee committed 2015-12-23 23:54:59 -06:00
1 parent 64a8dfbcfe
commit d58f153742
5 files changed
+51 -9

No files matched your search

@@ -18,7 +18,7 @@ import vazkii.botania.api.internal.IManaBurst;
*
* <b>Implementation Instructions:</b><br>
* - Override invalidate() and onChunkUnload(), calling <i>ManaNetworkEvent.removeCollector(this);</i> on both.<br>
* - On the first tick of onUpdate(), call </i>ManaNetworkEvent.addCollector(this);<i>
* - On the first tick of update() (or onLoad() in Forge build 1606 or higher), call </i>ManaNetworkEvent.addCollector(this);<i>
*/
public interface IManaCollector extends IManaReceiver {
@@ -52,7 +52,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable {
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
GameRegistry.registerBlock(this, null, par1Str);
return super.setUnlocalizedName(par1Str);
}
@@ -10,8 +10,10 @@
*/
package vazkii.botania.common.entity;
import com.google.common.collect.ImmutableMap;
import net.minecraft.block.Block;
import net.minecraft.block.BlockVine;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityThrowable;
@@ -21,6 +23,8 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import vazkii.botania.common.block.ModBlocks;
import java.util.Map;
public class EntityVineBall extends EntityThrowable {
public EntityVineBall(World par1World) {
@@ -39,18 +43,18 @@ public class EntityVineBall extends EntityThrowable {
protected void onImpact(MovingObjectPosition var1) {
if(var1 != null) {
EnumFacing dir = var1.sideHit;
int[] metaPlace = new int[] {
1, 4, 8, 2
};
if(dir.getAxis() != EnumFacing.Axis.Y) {
Map<EnumFacing, PropertyBool> propMap = ImmutableMap.of(EnumFacing.NORTH, BlockVine.NORTH, EnumFacing.SOUTH, BlockVine.SOUTH,
EnumFacing.WEST, BlockVine.WEST, EnumFacing.EAST, BlockVine.EAST);
if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) {
BlockPos pos = var1.getBlockPos().offset(dir);
while(pos.getY() > 0) {
Block block = worldObj.getBlockState(pos).getBlock();
if(block.isAir(worldObj, pos)) {
IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(BlockVine.ALL_FACES[dir.getIndex() + 1], true);
IBlockState state = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true);
worldObj.setBlockState(pos, state, 1 | 2);
worldObj.playAuxSFX(2001, pos, Block.getStateId(state)); // todo 1.8 verify
worldObj.playAuxSFX(2001, pos, Block.getStateId(state));
pos = pos.down();
} else break;
}