Follow up r15768 (bugreport:5411) - special thanks to Kenpachi!

Shield Bommerang takes weapon element only until it calculates its damage against target, from there on (dmg reduction calculation) it uses neutral.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15778 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/map/battle.c

@@ -2546,6 +2546,14 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
 				wd.damage2 += battle_attr_fix(src, target, damage, sc->data[SC_WATK_ELEMENT]->val1, tstatus->def_ele, tstatus->ele_lv);
 			}
 		}
+	#if REMODE
+		/**
+		 * In RE Shield Bommerang takes weapon element only for damage calculation,
+		 * - resist calculation is always against neutral
+		 **/
+		if ( skill_num == CR_SHIELDBOOMERANG )
+			s_ele = s_ele_ = ELE_NEUTRAL;
+	#endif
 	}
 
 	if(skill_num == CR_GRANDCROSS || skill_num == NPC_GRANDDARKNESS)