Merge pull request #41 from jonathan-robertson/dev

Crash Fix

Author: jonathan-robertson

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.3] - 2023-04-16
+
+- fix crash caused by complex multi-dim blocks
+- fix unintentional offset check at wrong time
+- update upper y check to 253 build limit
+
 ## [1.1.2] - 2023-03-05
 
 - add conf check when applying warp effects buff

ModInfo.xml

@@ -3,7 +3,7 @@
         <Name value="Quantum Elevators" />
         <Description value="Add infinite distance, vertical-warp elevator panels." />
         <Author value="Jonathan Robertson (Kanaverum)" />
-        <Version value="1.1.2" />
+        <Version value="1.1.3" />
         <Website value="https://github.com/jonathan-robertson/quantum-elevators" />
     </ModInfo>
 </xml>

QuantumElevators.dll

@@ -104,6 +104,11 @@ internal static bool Push(Vector3i blockPos)
             var crowd = GetEntitiesAt(blockPos);
             _log.Debug($"found {crowd.Count} entities at position");
 
+            if (crowd.Count == 0)
+            {
+                return false;
+            }
+
             var offsets = FindOffsets(blockPos);
             _log.Debug($"found {offsets.Count} possible offsets");
 
@@ -149,7 +154,7 @@ internal static bool Push(Vector3i blockPos)
                     crowd[i].SetPosition(newPos);
                 }
             }
-            return crowd.Count > 0;
+            return true;
         }
 
         /// <summary>
@@ -192,7 +197,7 @@ private static bool CanAccess(EntityPlayer player, PlatformUserIdentifierAbs int
         {
             if (blockValue.Block.blockID == ModApi.PortableQuantumBlockId)
             {
-                _log.Debug($"{player.GetBlockPosition()} contains a PortableQuantumBlock; premission is always granted");
+                _log.Debug($"{player.GetBlockPosition()} contains a PortableQuantumBlock; permission is always granted");
                 secureTileEntity = null;
                 return true;
             }
@@ -306,18 +311,15 @@ private static bool TryGetClientInfo(int entityId, out ClientInfo clientInfo)
         /// <returns>Whether a quantum elevator block above the sourcePos can be warped to.</returns>
         private static bool TryGetFloorAbove(PlatformUserIdentifierAbs internalId, Vector3i sourcePos, BlockValue sourceBlockValue, TileEntitySign source, out Vector3i targetPos)
         {
-            _log.Debug("calling TryGetFloorAbove");
-            targetPos = sourcePos;
+            _log.Trace("calling TryGetFloorAbove");
             var clrId = GameManager.Instance.World.ChunkCache.ClusterIdx;
-            // confirm if 256 is the right place to stop
 
-            _log.Debug($"planning to look above, starting at {targetPos}");
+            var crawlerPos = sourcePos;
             BlockValue targetBlockValue;
-            for (targetPos.y += GetBlockHeight(sourceBlockValue); targetPos.y < 256; targetPos.y += GetBlockHeight(targetBlockValue))
+            _log.Debug($"planning to look above, starting from {crawlerPos}");
+            for (crawlerPos.y += GetBlockHeight(sourceBlockValue); crawlerPos.y < 253; crawlerPos.y += GetBlockHeight(targetBlockValue))
             {
-                targetBlockValue = GetBaseBlockPositionAndValue(targetPos, out targetPos);
-                _log.Debug($"now checking {targetPos}");
-
+                targetBlockValue = GetBaseBlockPositionAndValue(crawlerPos, out targetPos);
                 if (targetBlockValue.Block.blockID == ModApi.PortableQuantumBlockId)
                 {
                     _log.Debug($"found the next accessible (portable) elevator at {targetPos} can be accessed");
@@ -341,7 +343,8 @@ private static bool TryGetFloorAbove(PlatformUserIdentifierAbs internalId, Vecto
                 }
             }
 
-            _log.Debug($"no elevator was found below");
+            _log.Trace($"no elevator was found below");
+            targetPos = default;
             return false;
         }
 
@@ -355,13 +358,13 @@ private static bool TryGetFloorAbove(PlatformUserIdentifierAbs internalId, Vecto
         /// <returns>Whether a quantum elevator block above the sourcePos can be warped to.</returns>
         private static bool TryGetFloorBelow(PlatformUserIdentifierAbs internalId, Vector3i sourcePos, TileEntitySign source, out Vector3i targetPos)
         {
-            _log.Debug("calling TryGetFloorBelow");
-            targetPos = sourcePos;
-            for (targetPos.y--; targetPos.y > 1; targetPos.y--)
+            _log.Trace("calling TryGetFloorBelow");
+            var crawlerPos = sourcePos;
+            BlockValue targetBlockValue;
+            _log.Debug($"planning to look below, starting from {crawlerPos}");
+            for (crawlerPos.y--; crawlerPos.y > 1; crawlerPos.y -= GetBlockHeight(targetBlockValue))
             {
-                var targetBlockValue = GetBaseBlockPositionAndValue(targetPos, out targetPos);
-                _log.Debug($"checking {targetPos} ({Block.nameIdMapping.GetNameForId(targetBlockValue.Block.blockID)})");
-
+                targetBlockValue = GetBaseBlockPositionAndValue(crawlerPos, out targetPos);
                 if (ModApi.PortableQuantumBlockId == targetBlockValue.Block.blockID)
                 {
                     _log.Debug($"found the next accessible (portable) elevator at {targetPos} can be accessed");
@@ -376,7 +379,8 @@ private static bool TryGetFloorBelow(PlatformUserIdentifierAbs internalId, Vecto
                 }
             }
 
-            _log.Debug($"no elevator was found below");
+            _log.Trace($"no elevator was found below");
+            targetPos = default;
             return false;
         }
 
@@ -404,21 +408,30 @@ private static int GetBlockHeight(BlockValue blockValue)
         /// <returns>The block value found at the given position.</returns>
         private static BlockValue GetBaseBlockPositionAndValue(Vector3i pos, out Vector3i blockPosition)
         {
+            _log.Trace($"GetBaseBlockPositionAndValue at position {pos}");
             blockPosition = pos;
-            _log.Debug($"GetBaseBlockPositionAndValue at position {pos}");
+
             var blockValue = GameManager.Instance.World.ChunkCache.GetBlock(pos);
-            if (blockValue.ischild)
+            var blockId = blockValue.Block.blockID;
+            _log.Trace($"blockId: {blockId}");
+            var blockName = blockId == 0
+                ? "air"
+                : Block.nameIdMapping != null
+                    ? Block.nameIdMapping.GetNameForId(blockValue.Block.blockID)
+                    : "no name mapping";
+            _log.Debug($"Identified block: id=[{blockId}], name=[{blockName}].");
+
+            var isChild = blockValue.ischild;
+            _log.Debug($"block: {blockValue}, isChild? {isChild}{(isChild ? ", parent:" + blockValue.parent : "")}");
+            if (isChild)
             {
-                _log.Debug($"Block found is a multi-block; self: {blockValue}, isChild? {blockValue.ischild}, parent: {blockValue.parent}");
-                _log.Debug($">> parentY: {blockValue.parenty}");
-                blockPosition.y += blockValue.parenty;
+                var parentY = blockValue.parenty;
+                _log.Debug($">> parentY: {parentY}");
+                blockPosition.y += parentY;
+                _log.Debug($"parent/tile position determined to be at {blockPosition}");
                 // NOTE: block value will be the same; leaving note here in case we ever find a way to make compound blocks
                 // blockValueBody = GameManager.Instance.World.GetBlock(blockPosition);
             }
-            else
-            {
-                _log.Debug($"Block found is not a multi-block; self: {blockValue}, isChild? {blockValue.ischild}");
-            }
             return blockValue;
         }
 

src/CoreLogic.cs

@@ -7,9 +7,9 @@
 [assembly: AssemblyTitle("QuantumElevators")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP")]
+[assembly: AssemblyCompany("Jonathan Robertson")]
 [assembly: AssemblyProduct("QuantumElevators")]
-[assembly: AssemblyCopyright("Copyright © HP 2022")]
+[assembly: AssemblyCopyright("Copyright © Jonathan Robertson 2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/EntityAlive_Patches.cs src/Patches.cssrc/EntityAlive_Patches.cs renamed to src/Patches.cs

@@ -64,7 +64,7 @@
   <ItemGroup>
     <Compile Include="ConsoleCmdQuantumElevators.cs" />
     <Compile Include="CoreLogic.cs" />
-    <Compile Include="EntityAlive_Patches.cs" />
+    <Compile Include="Patches.cs" />
     <Compile Include="ModApi.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ModLog.cs" />