Skip to content

Commit 8b9f552

Browse files
author
Ridley
committed
no message
1 parent 873f615 commit 8b9f552

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/map/clif.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11466,12 +11466,12 @@ static void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action
1146611466
case 0x07: // continuous attack
1146711467
{
1146811468
struct npc_data *nd = map->id2nd(target_id);
11469-
if (nd != NULL) {
11469+
if (nd != NULL && !sd->block_action.npc) { // *pcblock script command
1147011470
npc->click(sd, nd);
1147111471
return;
1147211472
}
1147311473

11474-
if (pc_cant_act(sd) || pc_issit(sd) || sd->sc.option&OPTION_HIDE || pc_isvending(sd) || sd->block_action.npc) // *pcblock script command
11474+
if (pc_cant_act(sd) || pc_issit(sd) || sd->sc.option&OPTION_HIDE || pc_isvending(sd))
1147511475
return;
1147611476

1147711477
if (sd->sc.option & OPTION_COSTUME)

src/map/script.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -529,15 +529,15 @@ enum script_petinfo_types {
529529
* Player blocking actions related flags.
530530
*/
531531
enum pcblock_action_flag {
532-
PCBLOCK_NONE = 0x00,
533-
PCBLOCK_MOVE = 0x01,
534-
PCBLOCK_ATTACK = 0x02,
535-
PCBLOCK_SKILL = 0x04,
536-
PCBLOCK_USEITEM = 0x08,
537-
PCBLOCK_CHAT = 0x10,
538-
PCBLOCK_IMMUNE = 0x20,
539-
PCBLOCK_SITSTAND = 0x40,
540-
PCBLOCK_COMMANDS = 0x80,
532+
PCBLOCK_NONE = 0x000,
533+
PCBLOCK_MOVE = 0x001,
534+
PCBLOCK_ATTACK = 0x002,
535+
PCBLOCK_SKILL = 0x004,
536+
PCBLOCK_USEITEM = 0x008,
537+
PCBLOCK_CHAT = 0x010,
538+
PCBLOCK_IMMUNE = 0x020,
539+
PCBLOCK_SITSTAND = 0x040,
540+
PCBLOCK_COMMANDS = 0x080,
541541
PCBLOCK_NPC = 0x100,
542542
PCBLOCK_ALL = 0x1FF,
543543
};

0 commit comments

Comments
 (0)