Cleaned up a big part of the EntityArmourListener