Adjusted onCollision

Now it returns the bullet_type, and the collisionObject name