|  | @@ -4,6 +4,7 @@ import com.gmail.nossr50.mcMMO;
 | 
	
		
			
				|  |  |  import org.bukkit.entity.LivingEntity;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  public class TransientMetadataTools {
 | 
	
		
			
				|  |  | +    public static final String OLD_NAME_METAKEY = "mcMMO_oldName";
 | 
	
		
			
				|  |  |      private final mcMMO pluginRef;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      public TransientMetadataTools(mcMMO pluginRef) {
 | 
	
	
		
			
				|  | @@ -17,6 +18,10 @@ public class TransientMetadataTools {
 | 
	
		
			
				|  |  |              livingEntity.removeMetadata(mcMMO.customNameKey, pluginRef);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +        if(livingEntity.hasMetadata(OLD_NAME_METAKEY)) {
 | 
	
		
			
				|  |  | +            livingEntity.removeMetadata(OLD_NAME_METAKEY, pluginRef);
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          //Involved in changing mob names to hearts
 | 
	
		
			
				|  |  |          if (livingEntity.hasMetadata(mcMMO.customVisibleKey)) {
 | 
	
		
			
				|  |  |              livingEntity.setCustomNameVisible(livingEntity.getMetadata(mcMMO.customVisibleKey).get(0).asBoolean());
 |