diff --git a/MCGalaxy/Blocks/Behaviour/PlaceBehaviour.cs b/MCGalaxy/Blocks/Behaviour/PlaceBehaviour.cs index 91622c12d..5511747de 100644 --- a/MCGalaxy/Blocks/Behaviour/PlaceBehaviour.cs +++ b/MCGalaxy/Blocks/Behaviour/PlaceBehaviour.cs @@ -63,7 +63,7 @@ namespace MCGalaxy.Blocks { } // Use red wool to detonate c4 - ExtBlock held = p.GetHeldBlock(); + ExtBlock held = p.BlockBindings[p.RawHeldBlock.RawID]; if (held.BlockID == Block.Red) { Player.Message(p, "Placed detonator block, delete it to detonate."); C4Det(p, (ExtBlock)Block.C4Detonator, x, y, z); return; diff --git a/MCGalaxy/Commands/CommandParser.cs b/MCGalaxy/Commands/CommandParser.cs index 0d6b6abb3..78806c75f 100644 --- a/MCGalaxy/Commands/CommandParser.cs +++ b/MCGalaxy/Commands/CommandParser.cs @@ -145,9 +145,9 @@ namespace MCGalaxy.Commands { internal static bool GetCoords(Player p, string[] args, int argsOffset, ref Vec3S32 P) { return - GetCoord(p, args[argsOffset + 0], P.X, "X", out P.X) && - GetCoord(p, args[argsOffset + 1], P.Y, "Y", out P.Y) && - GetCoord(p, args[argsOffset + 2], P.Z, "Z", out P.Z); + GetCoord(p, args[argsOffset + 0], P.X, "X coordinate", out P.X) && + GetCoord(p, args[argsOffset + 1], P.Y, "Y coordinate", out P.Y) && + GetCoord(p, args[argsOffset + 2], P.Z, "Z coordinate", out P.Z); } static bool GetCoord(Player p, string arg, int cur, string axis, out int value) { @@ -155,7 +155,7 @@ namespace MCGalaxy.Commands { if (relative) arg = arg.Substring(1); value = 0; - if (!GetInt(p, arg, axis + " coordinate", ref value)) return false; + if (!GetInt(p, arg, axis, ref value)) return false; if (relative) value += cur; return true; }