From 65bfe62051503be22c44bd666d1ac1c0081a9e42 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Mon, 10 Jul 2017 21:09:52 +1000
Subject: [PATCH] Fix /gun blockchange handler still being called even after
 disabling guns on a map. (Thanks Ozy)

---
 MCGalaxy/Commands/Fun/CmdGun.cs     | 4 +++-
 MCGalaxy/Commands/Fun/CmdMissile.cs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/MCGalaxy/Commands/Fun/CmdGun.cs b/MCGalaxy/Commands/Fun/CmdGun.cs
index 2c85d87e3..4b3a84318 100644
--- a/MCGalaxy/Commands/Fun/CmdGun.cs
+++ b/MCGalaxy/Commands/Fun/CmdGun.cs
@@ -28,7 +28,9 @@ namespace MCGalaxy.Commands.Fun {
         
         protected override void PlacedMark(Player p, ushort x, ushort y, ushort z, ExtBlock block) {
             p.RevertBlock(x, y, z);
-            if (!CommandParser.IsBlockAllowed(p, "place", block)) return;
+            if (!p.level.Config.Guns || !CommandParser.IsBlockAllowed(p, "place", block)) {
+                p.ClearBlockchange(); return;
+            }
 
             WeaponArgs args = new WeaponArgs();
             args.player = p;
diff --git a/MCGalaxy/Commands/Fun/CmdMissile.cs b/MCGalaxy/Commands/Fun/CmdMissile.cs
index e41e7ee23..7c1f70531 100644
--- a/MCGalaxy/Commands/Fun/CmdMissile.cs
+++ b/MCGalaxy/Commands/Fun/CmdMissile.cs
@@ -33,7 +33,9 @@ namespace MCGalaxy.Commands.Fun {
                 p.aiming = false;
             }
             p.RevertBlock(x, y, z);
-            if (!CommandParser.IsBlockAllowed(p, "place", block)) return;
+            if (!p.level.Config.Guns || !CommandParser.IsBlockAllowed(p, "place", block)) {
+                p.ClearBlockchange(); return;
+            }
             
             WeaponArgs args = new WeaponArgs();
             args.player = p;