|
@@ -4736,6 +4736,7 @@ bool pc_isUseitem(struct map_session_data *sd,int n)
|
|
sd->sc.data[SC_KAGEHUMI] ||
|
|
sd->sc.data[SC_KAGEHUMI] ||
|
|
(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) ||
|
|
(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) ||
|
|
sd->sc.data[SC_HEAT_BARREL_AFTER] ||
|
|
sd->sc.data[SC_HEAT_BARREL_AFTER] ||
|
|
|
|
+ sd->sc.data[SC_KINGS_GRACE] ||
|
|
sd->sc.data[SC_SUHIDE]))
|
|
sd->sc.data[SC_SUHIDE]))
|
|
return false;
|
|
return false;
|
|
|
|
|
|
@@ -8703,7 +8704,8 @@ bool pc_can_attack( struct map_session_data *sd, int target_id ) {
|
|
(sd->sc.data[SC_VOICEOFSIREN] && sd->sc.data[SC_VOICEOFSIREN]->val2 == target_id) ||
|
|
(sd->sc.data[SC_VOICEOFSIREN] && sd->sc.data[SC_VOICEOFSIREN]->val2 == target_id) ||
|
|
sd->sc.data[SC_BLADESTOP] ||
|
|
sd->sc.data[SC_BLADESTOP] ||
|
|
sd->sc.data[SC_DEEPSLEEP] ||
|
|
sd->sc.data[SC_DEEPSLEEP] ||
|
|
- (sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) )
|
|
|
|
|
|
+ (sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) ||
|
|
|
|
+ sd->sc.data[SC_KINGS_GRACE] )
|
|
return false;
|
|
return false;
|
|
|
|
|
|
return true;
|
|
return true;
|