EnableMaxBuildingsPerLocation now ignores building on vehicles while at location

RestoreMonarchy · RestoreMonarchy · commit a83f6a861013 · 2025-05-01T20:38:06.000+02:00
diff --git a/BuildingRestrictions/BuildingRestrictions.csproj b/BuildingRestrictions/BuildingRestrictions.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net48</TargetFramework>
 	  <LangVersion>latest</LangVersion>
 	  <RootNamespace>RestoreMonarchy.BuildingRestrictions</RootNamespace>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/BuildingRestrictions/BuildingRestrictionsPlugin.cs b/BuildingRestrictions/BuildingRestrictionsPlugin.cs
@@ -232,8 +232,14 @@ private void OnDeployBarricadeRequested(Barricade barricade, ItemBarricadeAsset
             }
 
             System.Action action = null;
-            if (Configuration.Instance.EnableMaxBuildingsPerLocation && TryGetBoundsWithHeight(point, out byte boundIndex) 
-                && asset.build != EBuild.BEACON && asset.build != EBuild.VEHICLE && asset.build != EBuild.CHARGE && asset.build != EBuild.SAFEZONE)
+            if (Configuration.Instance.EnableMaxBuildingsPerLocation 
+                && TryGetBoundsWithHeight(point, out byte boundIndex)
+                && (hit == null || !hit.transform.CompareTag("Vehicle"))
+                && asset.build != EBuild.BEACON 
+                && asset.build != EBuild.VEHICLE 
+                && asset.build != EBuild.CHARGE 
+                && asset.build != EBuild.SAFEZONE
+            )
             {
                 if (Configuration.Instance.MaxBuildingsPerLocation == 0)
                 {

Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,14 @@ private void OnDeployBarricadeRequested(Barricade barricade, ItemBarricadeAsset`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`System.Action action = null;`
`235`		`- if (Configuration.Instance.EnableMaxBuildingsPerLocation && TryGetBoundsWithHeight(point, out byte boundIndex)`
`236`		`- && asset.build != EBuild.BEACON && asset.build != EBuild.VEHICLE && asset.build != EBuild.CHARGE && asset.build != EBuild.SAFEZONE)`
	`235`	`+ if (Configuration.Instance.EnableMaxBuildingsPerLocation`
	`236`	`+ && TryGetBoundsWithHeight(point, out byte boundIndex)`
	`237`	`+ && (hit == null \|\| !hit.transform.CompareTag("Vehicle"))`
	`238`	`+ && asset.build != EBuild.BEACON`
	`239`	`+ && asset.build != EBuild.VEHICLE`
	`240`	`+ && asset.build != EBuild.CHARGE`
	`241`	`+ && asset.build != EBuild.SAFEZONE`
	`242`	`+ )`
`237`	`243`	`{`
`238`	`244`	`if (Configuration.Instance.MaxBuildingsPerLocation == 0)`
`239`	`245`	`{`