Fixes Palm Push Strike to push characters in Safety Wall - bugreport:7500

Ventus - Zephyr (defensive state) no longer nullifies magic damage - bugreport:7506

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

src/map/battle.c

@@ -793,7 +793,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
 		}
 
 		if(sc->data[SC_ZEPHYR] &&
-			flag&(BF_LONG|BF_SHORT)){
+			flag&(BF_LONG|BF_SHORT) == (BF_SHORT|BF_LONG)){
 				d->dmg_lv = ATK_BLOCK;
 				return 0;
 		}

src/map/skill.c

@@ -3374,6 +3374,10 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
 							( sc && sc->option&OPTION_HIDE ) ){
 							skill_blown(src,target,skill_get_blewcount(skl->skill_id, skl->skill_lv), -1, 0x0 );
 							break;
+						} else if( tsc && tsc->data[SC_SAFETYWALL] ){
+							skill_attack(skl->type,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag);
+							skill_blown(src,target,skill_get_blewcount(skl->skill_id, skl->skill_lv), -1, 0x0 );
+							break;
 						}
 					}
 				default: