Fix for field terminals. (#2)

* Fix for field terminals.

* fix remote market server error

* gives player equal syndicate protection and molecular instability when teleporting.

* Tweak syndicate protection to be 25% less than instability

src/Perpetuum.RequestHandlers/GetRobotInfo.cs

@@ -24,55 +24,57 @@ public GetRobotInfo(IZoneManager zoneManager,RobotHelper robotHelper)
 
         public void HandleRequest(IRequest request)
         {
-            TransactionScope scope = null;
-            try
+            // make sure the transaction scope is disposed of properly.
+            using (TransactionScope scope = Db.CreateTransaction())
             {
-                if (TryGetRobotFromZone(request, out Robot robot))
+                try
                 {
-                    scope = Db.CreateTransaction();
-                    robot.EnlistTransaction();
-                }
-                else
-                {
-                    var robotEid = request.Data.GetOrDefault<long>(k.robotEID);
-                    robot = _robotHelper.LoadRobotForCharacter(robotEid,request.Session.Character);
-                }
+                    if (TryGetRobotFromZone(request, out Robot robot))
+                    {
+                        robot.EnlistTransaction();
+                    }
+                    else
+                    {
+                        var robotEid = request.Data.GetOrDefault<long>(k.robotEID);
+                        robot = _robotHelper.LoadRobotForCharacter(robotEid, request.Session.Character);
+                    }
 
-                if (robot == null)
-                    throw new PerpetuumException(ErrorCodes.RobotNotFound);
+                    if (robot == null)
+                        throw new PerpetuumException(ErrorCodes.RobotNotFound);
 
-                if ( !robot.IsSingleAndUnpacked)
-                    throw new PerpetuumException(ErrorCodes.RobotMustbeSingleAndNonRepacked);
+                    if (!robot.IsSingleAndUnpacked)
+                        throw new PerpetuumException(ErrorCodes.RobotMustbeSingleAndNonRepacked);
 
-                if (ForFitting)
-                {
-                    robot.CheckOwnerOnlyCharacterAndThrowIfFailed(request.Session.Character);
-                }
-                else
-                {
-                    robot.CheckOwnerCharacterAndCorporationAndThrowIfFailed(request.Session.Character);
-                }
+                    if (ForFitting)
+                    {
+                        robot.CheckOwnerOnlyCharacterAndThrowIfFailed(request.Session.Character);
+                    }
+                    else
+                    {
+                        robot.CheckOwnerCharacterAndCorporationAndThrowIfFailed(request.Session.Character);
+                    }
 
-                switch (robot.GetOrLoadParentEntity())
-                {
-                    case DefaultSystemContainer _:
-                    case RobotInventory _ when ForFitting:
-                    case CorporateHangar _ when ForFitting:
+                    switch (robot.GetOrLoadParentEntity())
                     {
-                        throw new PerpetuumException(ErrorCodes.AccessDenied);
+                        case DefaultSystemContainer _:
+                        case RobotInventory _ when ForFitting:
+                        case CorporateHangar _ when ForFitting:
+                            {
+                                throw new PerpetuumException(ErrorCodes.AccessDenied);
+                            }
                     }
-                }
 
-                var result = new Dictionary<string, object>
+                    var result = new Dictionary<string, object>
                 {
                     { k.robot,robot.ToDictionary() }
                 };
 
-                Message.Builder.FromRequest(request).WithData(result).WrapToResult().WithEmpty().Send();
-            }
-            finally
-            {
-                scope?.Complete();
+                    Message.Builder.FromRequest(request).WithData(result).WrapToResult().WithEmpty().Send();
+                }
+                finally
+                {
+                    scope?.Complete();
+                }
             }
         }
 

src/Perpetuum/Players/Player.cs

@@ -315,9 +315,16 @@ public void SendModuleProcessError(Module module, ErrorCodes error)
         public void ApplyInvulnerableEffect()
         {
             var builder = NewEffectBuilder().SetType(EffectType.effect_invulnerable);
+            builder.WithDurationModifier(0.75); //Reduce span of syndicate protection
             ApplyEffect(builder);
         }
 
+        public void RemoveInvulnerableEffect()
+        {
+            EffectHandler.RemoveEffectsByType(EffectType.effect_invulnerable);
+        }
+
+
         public void ApplyTeleportSicknessEffect()
         {
             var zone = Zone;

src/Perpetuum/Services/MarketEngine/MarketOrderRepository.cs

@@ -38,7 +38,7 @@ public static class MarketOrderRepositoryExtensions
 
     public class MarketOrderRepository : IMarketOrderRepository
     {
-        private const string ORDER_COLUMNS = "marketitemid, marketeid, itemeid, itemdefinition, submittereid, submitted, duration, isSell, price, quantity, usecorporationwallet, isvendoritem, formembersof FROM marketitems ";
+        private const string ORDER_COLUMNS = "marketitems.marketitemid, marketitems.marketeid, marketitems.itemeid, marketitems.itemdefinition, marketitems.submittereid, marketitems.submitted, marketitems.duration, marketitems.isSell, marketitems.price, marketitems.quantity, marketitems.usecorporationwallet, marketitems.isvendoritem, marketitems.formembersof FROM marketitems ";
         private const string ORDER_SELECT = "SELECT " + ORDER_COLUMNS;
         private const string TOP1_SELECT = "SELECT TOP (1) " + ORDER_COLUMNS;
         private readonly MarketOrder.Factory _marketOrderFactory;
@@ -155,7 +155,9 @@ public IEnumerable<MarketOrder> GetExpiredOrders(TimeSpan duration)
 
         public IEnumerable<MarketOrder> GetAllByDefinition(int definition)
         {
-            const string cmd = ORDER_SELECT + @"where itemdefinition = @definition";
+            // this is an example as to why we should not have a table that references itself.
+            // the purpose of this is to not return market items on disabled zones.
+            const string cmd = ORDER_SELECT + @"INNER JOIN entities as childentity on (marketitems.marketeid=childentity.eid) INNER JOIN entities parent on (childentity.eid=parent.eid) INNER JOIN zoneentities on (parent.parent=zoneentities.eid) INNER JOIN zones on (zoneentities.zoneid=zones.id) where itemdefinition = @definition and zones.enabled=1";
 
             return Db.Query().CommandText(cmd)
                            .SetParameter("@definition", definition)

src/Perpetuum/Zones/Teleporting/Strategies/TeleportWithinZone.cs

@@ -53,8 +53,15 @@ public Task DoTeleportAsync(Player player)
                 player.AddToZone(zone,validPosition,ZoneEnterType.LocalTeleport);
                 player.SendInitSelf();
 
-                if ( ApplyTeleportSickness )
+                if (ApplyTeleportSickness)
+                {
                     player.ApplyTeleportSicknessEffect();
+                }
+                if (ApplyInvulnerable)
+                {
+                    player.RemoveInvulnerableEffect(); // remove previous effect.
+                    player.ApplyInvulnerableEffect(); // re-add effect to restart counter.
+                }
 
                 // mozoghat, fade out
                 player.States.InMoveable = false;