diff --git a/Data/Decoration/Malas/haochi's trials quest.cfg b/Data/Decoration/Malas/haochi's trials quest.cfg index 219e2897d..e087c0375 100644 --- a/Data/Decoration/Malas/haochi's trials quest.cfg +++ b/Data/Decoration/Malas/haochi's trials quest.cfg @@ -1,5 +1,5 @@ # Candle -HonorCandle 0x1433 +HonorCandle 0x1433 (Unlit; Unprotected) 419 731 17 420 731 17 422 731 17 diff --git a/Scripts/Commands/Decorate.cs b/Scripts/Commands/Decorate.cs index 9bd7bf856..e24dc00ce 100644 --- a/Scripts/Commands/Decorate.cs +++ b/Scripts/Commands/Decorate.cs @@ -417,15 +417,23 @@ namespace Server.Commands } else if ( item is BaseLight ) { - bool unlit = false; + bool unlit, unprotected = false; - for ( int i = 0; !unlit && i < m_Params.Length; ++i ) - unlit = ( m_Params[i] == "Unlit" ); + for ( int i = 0; i < m_Params.Length; ++i ) + { + if ( !unlit && m_Params[i] == "Unlit" ) + unlit = true; + else if ( !unprotected && m_Params[i] == "Unprotected" ) + unprotected = true; + + if ( unlit && unprotected ) + break; + } if ( !unlit ) ((BaseLight)item).Ignite(); - - ((BaseLight)item).Protected = true; + if ( !unprotected ) + ((BaseLight)item).Protected = true; if ( m_ItemID > 0 ) item.ItemID = m_ItemID;