- Changed the night status from 149 to 160, which seems to work so much better, and also enabled simplifying the night code. The previous code was there left commented in case it's needed again.

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

1 files changed, 15 insertions, 2 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 6fe7694b0..93f7d260c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8328,10 +8328,16 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 		if(merc_is_hom_active(sd->hd))
 			merc_hom_init_timers(sd->hd);
 
-		//Delayed night effect on log-on fix for the glow-issue. Thanks to Larry.
 		if (night_flag && map[sd->bl.m].flag.nightenabled)
+#if 0
+			//Delayed night effect on log-on fix for the glow-issue. Thanks to Larry.
 			add_timer(gettick()+1000,clif_nighttimer,sd->bl.id,0);
-
+#else
+		{
+			sd->state.night = 1;
+			clif_status_load(&sd->bl, SI_NIGHT, 1);
+		}
+#endif
 		// Notify everyone that this char logged in [Skotlex].
 		clif_foreachclient(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 1);
 
@@ -8351,11 +8357,18 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 		//New 'night' effect by dynamix [Skotlex]
 		if (night_flag && map[sd->bl.m].flag.nightenabled)
 		{	//Display night.
+#if 0
 			if (sd->state.night) //It must be resent because otherwise players get this annoying aura...
 				clif_status_load(&sd->bl, SI_NIGHT, 0);
 			else
 				sd->state.night = 1;
 			clif_status_load(&sd->bl, SI_NIGHT, 1);
+#else
+			if (!sd->state.night) {
+				sd->state.night = 1;
+				clif_status_load(&sd->bl, SI_NIGHT, 1);
+			}
+#endif
 		} else if (sd->state.night) { //Clear night display.
 			sd->state.night = 0;
 			clif_status_load(&sd->bl, SI_NIGHT, 0);