Merge master

This commit is contained in:
Vincent Lee committed 2019-01-16 14:46:30 -06:00
commit eaaa55fdb0
254 files changed
+8593 -1893

No files matched your search

@@ -138,10 +138,10 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
}
@Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity par5Entity) {
if(par5Entity instanceof EntityItem) {
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) {
if(entity instanceof EntityItem) {
TilePool tile = (TilePool) world.getTileEntity(pos);
if(tile.collideEntityItem((EntityItem) par5Entity))
if(tile.collideEntityItem((EntityItem) entity))
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos);
}
}