Change entity in disguise to getEntity()
Code cleanup, fixed primed tnt disappearing