AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 20:16:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /gun blockchange handler still being called even after disabling guns on a map. (Thanks Ozy)

Browse Source
This commit is contained in:
UnknownShadow200 2017-07-10 21:09:52 +10:00
parent 1fcccda0ca
commit 65bfe62051
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MCGalaxy/Commands/Fun/CmdGun.cs
View File

@ -28,7 +28,9 @@ namespace MCGalaxy.Commands.Fun {
protected override void PlacedMark(Player p, ushort x, ushort y, ushort z, ExtBlock block) { protected override void PlacedMark(Player p, ushort x, ushort y, ushort z, ExtBlock block) {
p.RevertBlock(x, y, z); 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(); WeaponArgs args = new WeaponArgs();
args.player = p; args.player = p;

4
MCGalaxy/Commands/Fun/CmdMissile.cs
View File

@ -33,7 +33,9 @@ namespace MCGalaxy.Commands.Fun {
p.aiming = false; p.aiming = false;
} }
p.RevertBlock(x, y, z); 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(); WeaponArgs args = new WeaponArgs();
args.player = p; args.player = p;