Fix CME in n.m.s.EntityTracker

Conflicts:
	src/main/java/net/minecraft/entity/EntityTracker.java