Proper message when source is different than target in some effect handlers.
Contributed by Sahar.
This commit is contained in:
		@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
 | 
			
		||||
			effected.broadcastStatusUpdate(effector);
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
 | 
			
		||||
		sm.addInt((int) amount);
 | 
			
		||||
		effected.sendPacket(sm);
 | 
			
		||||
		if ((effector != null) && (effector != effected))
 | 
			
		||||
		{
 | 
			
		||||
			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
 | 
			
		||||
			sm.addString(effector.getName());
 | 
			
		||||
			sm.addInt((int) amount);
 | 
			
		||||
			effected.sendPacket(sm);
 | 
			
		||||
		}
 | 
			
		||||
		else
 | 
			
		||||
		{
 | 
			
		||||
			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
 | 
			
		||||
			sm.addInt((int) amount);
 | 
			
		||||
			effected.sendPacket(sm);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
 | 
			
		||||
			effected.broadcastStatusUpdate(effector);
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
 | 
			
		||||
		sm.addInt((int) amount);
 | 
			
		||||
		effected.sendPacket(sm);
 | 
			
		||||
		if ((effector != null) && (effector != effected))
 | 
			
		||||
		{
 | 
			
		||||
			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
 | 
			
		||||
			sm.addString(effector.getName());
 | 
			
		||||
			sm.addInt((int) amount);
 | 
			
		||||
			effected.sendPacket(sm);
 | 
			
		||||
		}
 | 
			
		||||
		else
 | 
			
		||||
		{
 | 
			
		||||
			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
 | 
			
		||||
			sm.addInt((int) amount);
 | 
			
		||||
			effected.sendPacket(sm);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user