From 359349ed01a18c5c0a4506c9c3bf5a69c6ebce6f Mon Sep 17 00:00:00 2001
From: xavier <xavier@a9ff2418-eebe-19e0-0898-3207744d8c45>
Date: Tue, 20 Sep 2011 01:08:30 +0000
Subject: [PATCH] correction in moongates regarding unhiding. ItemID wands
 should not be dropping on AoS+ shards.

---
 Scripts/Items/Skill Items/Magical/Misc/Moongate.cs |  5 +----
 Scripts/Items/Wands/RandomWand.cs                  |  6 +++++-
 Scripts/Misc/Loot.cs                               | 14 +++++++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs b/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
index 49278eae7..0180e7cf6 100644
--- a/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs	
+++ b/Scripts/Items/Skill Items/Magical/Misc/Moongate.cs	
@@ -104,11 +104,8 @@ namespace Server.Items
 		public virtual void CheckGate( Mobile m, int range )
 		{
 			#region Mondain's Legacy
-			if ( m.Hidden && Core.ML )
-			{
+			if ( m.Hidden && m.AccessLevel == AccessLevel.Player && Core.ML )
 				m.RevealingAction();
-				m.SendLocalizedMessage( 501955 ); // Your spirit lacks the cohesion for gate travel at this time.
-			}
 			#endregion
 
 			new DelayTimer( m, this, range ).Start();
diff --git a/Scripts/Items/Wands/RandomWand.cs b/Scripts/Items/Wands/RandomWand.cs
index 8c982e0c8..c1e3e7755 100644
--- a/Scripts/Items/Wands/RandomWand.cs
+++ b/Scripts/Items/Wands/RandomWand.cs
@@ -10,8 +10,11 @@ namespace Server.Items
 			return CreateRandomWand();
 		}
 
-		public static BaseWand CreateRandomWand( )
+		public static BaseWand CreateRandomWand()
 		{
+			return Loot.RandomWand();
+
+			/*
 			switch ( Utility.Random( 11 ) )
 			{
 				default:
@@ -27,6 +30,7 @@ namespace Server.Items
 				case  9: return new ManaDrainWand();
 				case 10: return new WeaknessWand();
 			}
+			*/
 		}
 	}
 }
\ No newline at end of file
diff --git a/Scripts/Misc/Loot.cs b/Scripts/Misc/Loot.cs
index 8d32ed0e9..27a94fcaf 100644
--- a/Scripts/Misc/Loot.cs
+++ b/Scripts/Misc/Loot.cs
@@ -271,11 +271,16 @@ namespace Server
 			{
 				typeof( ClumsyWand ),               typeof( FeebleWand ),           typeof( FireballWand ),
 				typeof( GreaterHealWand ),          typeof( HarmWand ),             typeof( HealWand ),
-				typeof( IDWand ),                   typeof( LightningWand ),        typeof( MagicArrowWand ),
-				typeof( ManaDrainWand ),            typeof( WeaknessWand )          
-                
+				typeof( LightningWand ),            typeof( MagicArrowWand ),       typeof( ManaDrainWand ),
+				typeof( WeaknessWand )
 			};
 		public static Type[] WandTypes{ get{ return m_WandTypes; } }
+		
+		private static Type[] m_OldWandTypes = new Type[]
+			{
+				typeof( IDWand )
+			};
+		public static Type[] OldWandTypes{ get{ return m_OldWandTypes; } }
 
 		private static Type[] m_SEClothingTypes = new Type[]
 			{
@@ -358,6 +363,9 @@ namespace Server
 
 		public static BaseWand RandomWand()
 		{
+			if ( !Core.AOS )
+				return Construct( m_OldWandTypes, m_WandTypes ) as BaseWand;
+			
 			return Construct( m_WandTypes ) as BaseWand;
 		}