From 41dda71a08c60c89e1ebaa825ee52439bad77606 Mon Sep 17 00:00:00 2001 From: xavier Date: Mon, 24 Dec 2012 17:24:05 +0000 Subject: [PATCH] --- .../Christmas/2010/Addons/FireFliesDeed.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs b/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs index 7d84a648d..29187d89a 100644 --- a/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs +++ b/Scripts/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs @@ -241,7 +241,17 @@ namespace Server.Items bool north = BaseAddon.IsWall( p3d.X, p3d.Y - 1, p3d.Z, map ); bool west = BaseAddon.IsWall( p3d.X - 1, p3d.Y, p3d.Z, map ); - if( ( m_ItemID == 0x2336 && north ) || ( m_ItemID == 0x2332 && west ) || from.Map.GetItemsInRange( p3d, 1 ) ) + bool isclear = true; + + foreach( Item item in Map.Malas.GetItemsInRange( p3d, 0 ) ) + { + if( item is Fireflies ) + { + isclear = false; + } + } + + if( ( ( m_ItemID == 0x2336 && north ) || ( m_ItemID == 0x2332 && west ) ) && isclear ) { Fireflies flies = new Fireflies( m_ItemID ); @@ -253,7 +263,7 @@ namespace Server.Items } else - from.SendLocalizedMessage( 1150065 ); // The banner must be placed next to a wall. + from.SendLocalizedMessage( 1150065 ); // Holiday fireflies must be placed next to a wall. } else from.SendLocalizedMessage( 1042036 ); // That location is not in your house.