really fixing the allow verb cast crash now

Skullywag · Oct 31, 2015 · 9a14e23 · 9a14e23
1 parent 951bfc3
commit 9a14e23
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/Assemblies/MedievalShields.dll b/Assemblies/MedievalShields.dll
diff --git a/Source/.vs/MedievalShields/v14/.suo b/Source/.vs/MedievalShields/v14/.suo
diff --git a/Source/MedievalShields/Apparel_Shield.cs b/Source/MedievalShields/Apparel_Shield.cs
@@ -91,18 +91,20 @@ public void Break()
         }
         public override bool AllowVerbCast(IntVec3 root, TargetInfo targ)
         {
-            equippedDef = this.wearer.equipment.Primary.def;
-            if (equippedDef.IsMeleeWeapon)
+            if (this.wearer.equipment.Primary != null)
             {
-                return true;
-            }
-            if (equippedDef.defName.Contains("pistol") || equippedDef.defName.Contains("Pistol"))
-            {
-                return true;
-            }
-            if (equippedDef == ThingDef.Named("Gun_PDW"))
-            {
-                return true;
+                if (this.wearer.equipment.Primary.def.IsMeleeWeapon)
+                {
+                    return true;
+                }
+                if (this.wearer.equipment.Primary.def.defName.Contains("pistol") || this.wearer.equipment.Primary.def.defName.Contains("Pistol"))
+                {
+                    return true;
+                }
+                if (this.wearer.equipment.Primary.def.defName.Contains("Gun_PDW"))
+                {
+                    return true;
+                }
             }
             return root.AdjacentTo8Way(targ.Cell);
         }

diff --git a/Source/MedievalShields/bin/Debug/MedievalShields.dll b/Source/MedievalShields/bin/Debug/MedievalShields.dll
diff --git a/Source/MedievalShields/bin/Debug/MedievalShields.pdb b/Source/MedievalShields/bin/Debug/MedievalShields.pdb
diff --git a/Source/MedievalShields/obj/Debug/MedievalShields.dll b/Source/MedievalShields/obj/Debug/MedievalShields.dll
diff --git a/Source/MedievalShields/obj/Debug/MedievalShields.pdb b/Source/MedievalShields/obj/Debug/MedievalShields.pdb