Ported bug fix
Fixed nether spam bug; made container detection more robust