diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-11-03 20:05:53 +0100 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-11-03 20:05:53 +0100 |
| commit | ea85ad9514c6d1e64457c215294a7090831d971b (patch) | |
| tree | e75d66f7e068d5d4df567182d0739a7a03307fcc /src/map/pc.c | |
| parent | 715af9d93adf4e07f11ff09a6a1b55d49d32849d (diff) | |
| parent | 82037b89b33c3fa2a5cfaf33038fbf9ebddea17f (diff) | |
| download | hercules-ea85ad9514c6d1e64457c215294a7090831d971b.tar.gz hercules-ea85ad9514c6d1e64457c215294a7090831d971b.tar.bz2 hercules-ea85ad9514c6d1e64457c215294a7090831d971b.tar.xz hercules-ea85ad9514c6d1e64457c215294a7090831d971b.zip | |
Merge pull request #363 from EPuncker/master
Added 4 new permissions
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index f07858ca6..1dc032f7c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4153,6 +4153,9 @@ int pc_takeitem(struct map_session_data *sd,struct flooritem_data *fitem) if(!check_distance_bl(&fitem->bl, &sd->bl, 2) && sd->ud.skill_id!=BS_GREED) return 0; // Distance is too far + if( pc_has_permission(sd,PC_PERM_DISABLE_PICK_UP) ) + return 0; + if (sd->status.party_id) p = party->search(sd->status.party_id); @@ -6029,6 +6032,9 @@ bool pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned in if(!battle_config.pvp_exp && map->list[sd->bl.m].flag.pvp) // [MouseJstr] return false; // no exp on pvp maps + if( pc_has_permission(sd,PC_PERM_DISABLE_EXP) ) + return false; + if(sd->status.guild_id>0) base_exp-=guild->payexp(sd,base_exp); |