- Ganbantein's delay is now 2 secs.

- Removed the time2 value of NJ_NEN since it has no use.
- Removed the return code entry when logging GM reload-GM requests (login-sql),it'll just be stored as zero.
- Added a fix on socket.c to not pick INADDR_ANY when choosing our own IP.
- Applied the correction on maprespawnguildid so that it parses ALL players and not just those on a map.
- TK_JUMPKICK now dispels normal aspd/speed potions (not berserk pitched ones) and Preserve will be unable to block this.
- Soul Linkers are now inmune to SA_DISPEL
- You can now place everything (except magic skills) on top of LPs.
- Corrected Ganbantein to not touch song/dance/ensembles.
- Status_calc_pc will refuse to execute if the player is still tagged as a "new connection" and the invocation is not meant to be the first one.
- Swapped the order of checks in status_isimmune so that Wand of Hermod skill blocking takes precedence over GTB's
- Client packets will all be ignored while a player is not on a map until the LoadEndAck packet is received.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9152 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 2 deletions

diff --git a/src/map/status.c b/src/map/status.c
index 8c26ad3d7..2c5a5c7e5 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1520,6 +1520,9 @@ int status_calc_pc(struct map_session_data* sd,int first)
 	int i,index;

 	int skill,refinedef=0;

 

+	if(sd->state.connect_new && !first&1) //Shouldn't invoke yet until player is done loading.

+		return -1;

+

 	if (++calculating > 10) //Too many recursive calls!

 		return -1;

 

@@ -4166,11 +4169,11 @@ int status_isdead(struct block_list *bl)
 int status_isimmune(struct block_list *bl)

 {

 	struct status_change *sc =status_get_sc(bl);

+	if (sc && sc->count && sc->data[SC_HERMODE].timer != -1)

+		return 1;

 	if (bl->type == BL_PC &&

 		((TBL_PC*)bl)->special_state.no_magic_damage)

 		return ((TBL_PC*)bl)->special_state.no_magic_damage > battle_config.gtb_sc_immunity;

-	if (sc && sc->count && sc->data[SC_HERMODE].timer != -1)

-		return 1;

 	return 0;

 }