From dd1c12f624d4bee547d1ecc68b1a5075a4b19d1f Mon Sep 17 00:00:00 2001 From: Aleos Date: Mon, 19 Aug 2024 03:07:39 -0400 Subject: [PATCH] Fix GD_CHARGESHOUT_BEATING check (#8564) Add missing parentheses to ensure the player is in a guild and avoid a short circuit check. Co-authored-by: Atemo --- src/map/clif.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 8915485f65..f0c64a3126 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -12834,7 +12834,7 @@ void clif_parse_skill_toid( map_session_data* sd, uint16 skill_id, uint16 skill_ sd->skillitem = sd->skillitemlv = 0; if( SKILL_CHK_GUILD(skill_id) ) { - if (sd->guild && sd->state.gmaster_flag || skill_id == GD_CHARGESHOUT_BEATING) + if (sd->guild != nullptr && (sd->state.gmaster_flag || skill_id == GD_CHARGESHOUT_BEATING)) skill_lv = guild_checkskill(sd->guild->guild, skill_id); else skill_lv = 0;