From a1054261bf5a6083004b66ffc6cd44271aba1908 Mon Sep 17 00:00:00 2001
From: eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 23 Dec 2011 13:41:11 +0000
Subject: * Merged changes up to eAthena 15038.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15225 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/skill.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/map/skill.c')

diff --git a/src/map/skill.c b/src/map/skill.c
index 328dcd322..ebb8f170b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2409,12 +2409,10 @@ static int skill_check_unit_range2 (struct block_list *bl, int x, int y, int ski
 
 int skill_guildaura_sub (struct map_session_data* sd, int id, int strvit, int agidex)
 {
-	nullpo_ret(sd);
-
-	if( id == sd->bl.id && battle_config.guild_aura&16 )
-		return 0;
+	if(id == sd->bl.id && battle_config.guild_aura&16)
+		return 0;  // Do not affect guild leader
 
-	if( sd->sc.data[SC_GUILDAURA] ) {
+	if (sd->sc.data[SC_GUILDAURA]) {
 		struct status_change_entry *sce = sd->sc.data[SC_GUILDAURA];
 		if( sce->val3 != strvit || sce->val4 != agidex ) {
 			sce->val3 = strvit;
-- 
cgit v1.2.3-70-g09d2