v1.1.3.6 - Added better failsafes against invalid world sizes

Author: hamstar0

MountedMagicMirrors/MyWorldGen.cs

@@ -1,17 +1,39 @@
-using HamstarHelpers.Helpers.DotNET.Extensions;
-using HamstarHelpers.Classes.Tiles.TilePattern;
-using Microsoft.Xna.Framework;
-using System;
+using System;
 using System.Collections.Generic;
+using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ModLoader;
 using Terraria.World.Generation;
-using MountedMagicMirrors.Tiles;
+using HamstarHelpers.Classes.Tiles.TilePattern;
 using HamstarHelpers.Helpers.Debug;
+using HamstarHelpers.Helpers.DotNET.Extensions;
+using MountedMagicMirrors.Tiles;
 
 
 namespace MountedMagicMirrors {
 	class MountedMirrorsGenPass : GenPass {
+		public static (int minTileX, int maxTileX, int minTileY, int maxTileY) GetTileBoundsForWorld() {
+			int minTileX = 64;
+			int maxTileX = Main.maxTilesX - minTileX;
+			if( Main.maxTilesX < 64 || maxTileX <= minTileX ) {
+				minTileX = 0;
+				maxTileX = Main.maxTilesX;
+			}
+
+			int minTileY = (int)Main.worldSurface;
+			int maxTileY = Main.maxTilesY - 220;
+			if( Main.maxTilesY <= 220 || maxTileY <= minTileY ) {
+				minTileY = 0;
+				maxTileY = Main.maxTilesY;
+			}
+
+			return (minTileX, maxTileX, minTileY, maxTileY);
+		}
+
+
+
+		////////////////
+
 		private TilePattern MirrorSpacePattern;
 		private int NeededMirrors;
 
@@ -44,16 +66,22 @@ public override void Apply( GenerationProgress progress ) {
 				progress.Message = "Pre-placing Mounted Magic Mirrors: %";
 			}
 
-			for( int i = 0; i < this.NeededMirrors; i++ ) {
-				progress?.Set( stepWeight * (float)i );
+			int minTileDist = MMMConfig.Instance.MinimumMirrorTileSpacing;
+			if( Main.maxTilesX <= (minTileDist + 4) || Main.maxTilesY <= (minTileDist + 4) ) {
+				LogHelpers.Warn( "Invalid world size." );
+				return;
+			}
 
+			for( int i = 0; i < this.NeededMirrors; i++ ) {
 				if( !this.GetRandomOpenMirrorableCenterTile(out randCenterTile, 1000) ) {
 					break;
 				}
 
 				this.MirrorPositions.Set2D( randCenterTile.TileX, randCenterTile.TileY );
 
 				this.SpawnMirror( randCenterTile.TileX, randCenterTile.TileY );
+
+				progress?.Set( stepWeight * (float)(i+1) );
 			}
 		}
 
@@ -78,12 +106,13 @@ private bool GetRandomOpenMirrorableCenterTile( out (int TileX, int TileY) randT
 		private (int TileX, int TileY) GetRandomMirrorableCenterTile( int maxAttempts ) {
 			int attempts = 0;
 			int randTileX, randTileY;
+			var bounds = MountedMirrorsGenPass.GetTileBoundsForWorld();
 
 			do {
 				WorldGen.genRand.Next();	// Desyncs this from Wormholes?
 				WorldGen.genRand.Next();
-				randTileX = WorldGen.genRand.Next( 64, Main.maxTilesX - 64 );
-				randTileY = WorldGen.genRand.Next( (int)Main.worldSurface, Main.maxTilesY - 220 );
+				randTileX = WorldGen.genRand.Next( bounds.minTileX, bounds.maxTileX );
+				randTileY = WorldGen.genRand.Next( bounds.minTileY, bounds.maxTileY );
 
 				if( this.MirrorSpacePattern.Check( randTileX, randTileY ) ) {
 					break;

MountedMagicMirrors/build.txt

@@ -1,6 +1,6 @@
 displayName = Mounted Magic Mirrors
 author = hamstar
-version = 1.1.3.5
+version = 1.1.3.6
 modReferences = HamstarHelpers@5.6.1.1
 buildIgnore = *.csproj, *.user, *.bat, obj\*, bin\*, .vs\*, .git\*
 homepage = https://forums.terraria.org/index.php?threads/mounted-magic-mirrors-fast-travel.83296/