lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #152 from mysticdrew/master

Browse source 
Plinth and Pedestal bounding box fix for servers
This commit is contained in:
WayofTime 2014-11-07 09:15:05 -05:00
commit dd3a093825
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java
View file

@ -39,6 +39,8 @@ public class BlockPedestal extends BlockContainer
setResistance(5.0F); setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic); setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("bloodPedestal"); this.setBlockName("bloodPedestal");
float f = 0.3125F;
this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f);
} }
@Override @Override
@ -169,11 +171,4 @@ public class BlockPedestal extends BlockContainer
return true; return true;
} }
@Override
public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3)
{
float f = 0.3125F;
this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f);
return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3);
}
} }

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java
View file

@ -39,6 +39,8 @@ public class BlockPlinth extends BlockContainer
setResistance(5.0F); setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic); setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("bloodPlinth"); this.setBlockName("bloodPlinth");
float f = 0.0625F;
this.setBlockBounds(f, 0.0F, f, 1.0f - f, 0.875f, 1.0f - f);
} }
@Override @Override
@ -169,11 +171,4 @@ public class BlockPlinth extends BlockContainer
return true; return true;
} }
@Override
public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3, Vec3 par6Vec3)
{
float f = 0.0625F;
this.setBlockBounds(f, 0.0F, f, 1.0f - f, 0.875f, 1.0f - f);
return super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3);
}
} }