summaryrefslogtreecommitdiff
path: root/src/map/mob.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-11 16:33:21 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-11 16:33:21 +0000
commitc8745227f8cead250ccb8af5e932fa696b352cfc (patch)
tree4d3d0a663093a6dc3f9e5f38a6e93ab7b7581955 /src/map/mob.c
parentd0e67c654cebf61e36595624ce9c467273d502e3 (diff)
downloadhercules-c8745227f8cead250ccb8af5e932fa696b352cfc.tar.gz
hercules-c8745227f8cead250ccb8af5e932fa696b352cfc.tar.bz2
hercules-c8745227f8cead250ccb8af5e932fa696b352cfc.tar.xz
hercules-c8745227f8cead250ccb8af5e932fa696b352cfc.zip
* Fixed "--en/ja--" usage in 'monster' script not working properly
* Speedup player autosaving * Optimised guild castle saving when autosaving player data * Added sd check in mob_damage git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1224 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mob.c')
-rw-r--r--src/map/mob.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 3fb7de38c..8f41f93c7 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2612,7 +2612,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type)
}
// Ore Discovery [Celest]
- if (pc_checkskill(sd,BS_FINDINGORE)>0 && battle_config.finding_ore_rate/100 >= rand()%1000) {
+ if (sd && pc_checkskill(sd,BS_FINDINGORE)>0 && battle_config.finding_ore_rate/100 >= rand()%1000) {
struct delay_item_drop *ditem;
int itemid[17] = { 714, 756, 757, 969, 984, 985, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, 1002 };
ditem=(struct delay_item_drop *)aCalloc(1,sizeof(struct delay_item_drop));
@@ -2631,7 +2631,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type)
}
//this drop log contains ALL dropped items + ORE (if there was ORE Recovery) [Lupus]
- if(log_config.drop > 0 && drop_items) //we check were there any drops.. and if not - don't write the log
+ if(sd && log_config.drop > 0 && drop_items) //we check were there any drops.. and if not - don't write the log
log_drop(sd, md->class_, log_item); //mvp_sd
if(sd && sd->state.attack_type == BF_WEAPON) {