- Small fix to prevent killer/killable states from allowing you to target yourself.

- Added Explosion Spirits to list of effects that dispel on logout.
- Fixed handling of guild skills by pc_blockskill_start, renamed it to skill_blockpc_start as it needs some constants available only in skill.c
- Fixed autoguard icon showing with stun.
- Fixed splash area of Ganbantein
- Fixed acid demonstration breaking shield instead of armor.
- Fixed Slim Pitcher crashing server ocassionally.
- Hopefully fixed Ankle Snare lasting the whole trap's duration
- Added sc_start(SC_ENDURE) on infinite endure bonus.
- Fixed Berserk Pitcher consuming required items twice.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5681 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index ace030d10..22778f836 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3489,7 +3489,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 				return -1; //Cannot be targeted yet.

 			if (sd->state.monster_ignore && src->type == BL_MOB)

 				return 0; //option to have monsters ignore GMs [Valaris]

-			if (sd->special_state.killable)

+			if (sd->special_state.killable && t_bl != s_bl)

 			{

 				state |= BCT_ENEMY; //Universal Victim

 				strip_enemy = 0;

@@ -3544,7 +3544,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 		case BL_PC:

 		{

 			struct map_session_data *sd = (struct map_session_data *) s_bl;

-			if (sd->special_state.killer)

+			if (sd->special_state.killer && s_bl != t_bl)

 			{

 				state |= BCT_ENEMY; //Is on a killing rampage :O

 				strip_enemy = 0;