Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Added pcblock and checkpcblock script commands. (#3951)" (#4048)

Browse Source 
This reverts commit 3e0d3d2fe6.
This commit is contained in:
Atemo
2019-03-26 16:41:14 +01:00
committed by GitHub
parent 3e0d3d2fe6
commit e4b41ef7e0
14 changed files with 19 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/map/npc.cpp
View File

@@ -984,9 +984,6 @@ int npc_touch_areanpc(struct map_session_data* sd, int16 m, int16 x, int16 y)
//if(sd->npc_id)
// return 1;
if (sd->state.block_action & PCBLOCK_NPCCLICK)
return 0;
struct map_data *mapdata = map_getmapdata(m);
for(i=0;i<mapdata->npc_num;i++)
@@ -1287,12 +1284,7 @@ int npc_click(struct map_session_data* sd, struct npc_data* nd)
//Hidden/Disabled npc.
if (nd->class_ < 0 || nd->sc.option&(OPTION_INVISIBLE|OPTION_HIDE))
return 1;
if (sd->state.block_action & PCBLOCK_NPCCLICK) {
clif_msg(sd, WORK_IN_PROGRESS);
return 1;
}
switch(nd->subtype) {
case NPCTYPE_SHOP:
clif_npcbuysell(sd,nd->bl.id);