From a4ce6caae209c2ad76e01d47786ae25251b5a3e8 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Fri, 11 Aug 2017 19:15:59 +1000 Subject: [PATCH] Don't allow setting odoor to same ID. --- MCGalaxy/Commands/World/CmdBlockProperties.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MCGalaxy/Commands/World/CmdBlockProperties.cs b/MCGalaxy/Commands/World/CmdBlockProperties.cs index 014c82d0a..490d000c4 100644 --- a/MCGalaxy/Commands/World/CmdBlockProperties.cs +++ b/MCGalaxy/Commands/World/CmdBlockProperties.cs @@ -205,6 +205,8 @@ namespace MCGalaxy.Commands.World { } else { ExtBlock other = GetBlock(p, scope, msg); if (other.IsInvalid) return; + if (other == block) { Player.Message(p, "ID of oDoor must be different."); return; } + scope[i].oDoorIndex = (ushort)other.Index; Player.Message(p, "oDoor for {0} set to: {1}", @@ -268,7 +270,7 @@ namespace MCGalaxy.Commands.World { Player.Message(p, "%H[scope] can be: %Score, global, level"); Player.Message(p, "%Hproperties: %Sportal, messageblock, rails, waterkills, " + - "lavakills, door, tdoor, killer, deathmessage, animalai, stackblock, opblock"); + "lavakills, door, tdoor, killer, deathmessage, animalai, stackblock, opblock, odoor"); Player.Message(p, "%HType %T/Help BlockProps [property] %Hfor more details"); } @@ -302,6 +304,8 @@ namespace MCGalaxy.Commands.World { } else if (message.CaselessEq("opblock")) { Player.Message(p, "%HMarks the block as being on OP block. OP blocks can't be blown up by explosions, " + "and can't be replaced in games when build type is ModifyOnly."); + } else if (message.CaselessEq("odoor")) { + Player.Message(p, "%HSets the block that this block is changed into, when activated by a neighbouring door."); } else { Player.Message(p, "&cUnrecognised property \"{0}\"", message); }