From 446724fb64fc64557ef4a2c63659359d7b6fb89f Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 1 Nov 2007 16:34:21 +0000 Subject: Removed code that queues OnAgitEliminate after the Emperium is broken, this is now done properly by the gvg script instead (partially deals with bugreport:342). If you have any extra castles, update your scripts accordingly. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11630 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mob.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/map/mob.c') diff --git a/src/map/mob.c b/src/map/mob.c index d202fd41a..88fad163f 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2189,14 +2189,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) //Emperium destroyed by script. Discard mvp character. [Skotlex] mvp_sd = NULL; - - // NPC Event [OnAgitBreak] - if(md->npc_event[0] && strcmp(((md->npc_event)+strlen(md->npc_event)-13),"::OnAgitBreak") == 0) { - ShowNotice("MOB.C: Run NPC_Event[OnAgitBreak].\n"); - if (agit_flag == 1) //Call to Run NPC_Event[OnAgitBreak] - guild_agit_break(md); - } - if(src && src->type == BL_MOB){ struct mob_data *smd = (struct mob_data *)src; if(smd->nd) @@ -2317,7 +2309,7 @@ int mob_guardian_guildchange(struct block_list *bl,va_list ap) return 0; } - md->guardian_data->guild_id = md->guardian_data->castle->guild_id; + md->guardian_data->guild_id = g->guild_id; md->guardian_data->emblem_id = g->emblem_id; md->guardian_data->guardup_lv = guild_checkskill(g,GD_GUARDUP); memcpy(md->guardian_data->guild_name, g->name, NAME_LENGTH); -- cgit v1.2.3-70-g09d2