Simplify blockprops

This commit is contained in:
UnknownShadow200 2017-08-10 13:52:15 +10:00
parent 66ce425c77
commit fa51b4d037

View File

@ -88,38 +88,31 @@ namespace MCGalaxy.Commands.World {
void SetProperty(Player p, BlockProps[] scope, ExtBlock block, void SetProperty(Player p, BlockProps[] scope, ExtBlock block,
string prop, string[] args) { string prop, string[] args) {
int i = block.Index;
if (prop == "portal") { if (prop == "portal") {
Toggle(p, scope, block, "a portal", scope[i].IsPortal = !scope[i].IsPortal;
(ref BlockProps props) => props.IsPortal = !props.IsPortal, OnToggleSet(p, scope, block, "a portal", scope[i].IsPortal);
(BlockProps props) => props.IsPortal);
} else if (prop == "mb" || prop == "messageblock") { } else if (prop == "mb" || prop == "messageblock") {
Toggle(p, scope, block, "a message block", scope[i].IsMessageBlock = !scope[i].IsMessageBlock;
(ref BlockProps props) => props.IsMessageBlock = !props.IsMessageBlock, OnToggleSet(p, scope, block, "a message block", scope[i].IsMessageBlock);
(BlockProps props) => props.IsMessageBlock);
} else if (prop == "rails") { } else if (prop == "rails") {
Toggle(p, scope, block, "train rails", scope[i].IsRails = !scope[i].IsRails;
(ref BlockProps props) => props.IsRails = !props.IsRails, OnToggleSet(p, scope, block, "train rails", scope[i].IsRails);
(BlockProps props) => props.IsRails);
} else if (prop == "waterkills") { } else if (prop == "waterkills") {
Toggle(p, scope, block, "killed by water", scope[i].WaterKills = !scope[i].WaterKills;
(ref BlockProps props) => props.WaterKills = !props.WaterKills, OnToggleSet(p, scope, block, "killed by water", scope[i].WaterKills);
(BlockProps props) => props.WaterKills);
} else if (prop == "lavakills") { } else if (prop == "lavakills") {
Toggle(p, scope, block, "killed by lava", scope[i].LavaKills = !scope[i].LavaKills;
(ref BlockProps props) => props.LavaKills = !props.LavaKills, OnToggleSet(p, scope, block, "killed by lava", scope[i].LavaKills);
(BlockProps props) => props.LavaKills);
} else if (prop == "door") { } else if (prop == "door") {
Toggle(p, scope, block, "a door", scope[i].IsDoor = !scope[i].IsDoor;
(ref BlockProps props) => props.IsDoor = !props.IsDoor, OnToggleSet(p, scope, block, "a door", scope[i].IsDoor);
(BlockProps props) => props.IsDoor);
} else if (prop == "tdoor") { } else if (prop == "tdoor") {
Toggle(p, scope, block, "a tdoor", scope[i].IsTDoor = !scope[i].IsTDoor;
(ref BlockProps props) => props.IsTDoor = !props.IsTDoor, OnToggleSet(p, scope, block, "a tdoor", scope[i].IsTDoor);
(BlockProps props) => props.IsTDoor);
} else if (prop == "killer" || prop == "death") { } else if (prop == "killer" || prop == "death") {
Toggle(p, scope, block, "a killer block", scope[i].KillerBlock = !scope[i].KillerBlock;
(ref BlockProps props) => props.KillerBlock = !props.KillerBlock, OnToggleSet(p, scope, block, "a killer block", scope[i].KillerBlock);
(BlockProps props) => props.KillerBlock);
} else if (prop == "deathmsg" || prop == "deathmessage") { } else if (prop == "deathmsg" || prop == "deathmessage") {
string msg = args.Length > 3 ? args[3] : null; string msg = args.Length > 3 ? args[3] : null;
SetDeathMessage(p, scope, block, msg); SetDeathMessage(p, scope, block, msg);
@ -130,28 +123,20 @@ namespace MCGalaxy.Commands.World {
string msg = args.Length > 3 ? args[3] : null; string msg = args.Length > 3 ? args[3] : null;
SetStackId(p, scope, block, msg); SetStackId(p, scope, block, msg);
} else if (prop == "opblock" || prop == "op") { } else if (prop == "opblock" || prop == "op") {
Toggle(p, scope, block, "an OP block", scope[i].OPBlock = !scope[i].OPBlock;
(ref BlockProps props) => props.OPBlock = !props.OPBlock, OnToggleSet(p, scope, block, "an OP block", scope[i].OPBlock);
(BlockProps props) => props.OPBlock);
} else { } else {
Help(p); Help(p);
} }
} }
delegate void BoolSetter(ref BlockProps props); static void OnToggleSet(Player p, BlockProps[] scope, ExtBlock block,
delegate bool BoolGetter(BlockProps props); string type, bool toggled) {
static void Toggle(Player p, BlockProps[] scope, ExtBlock block, string type,
BoolSetter setter, BoolGetter getter) {
BlockProps props = scope[block.Index];
setter(ref props);
scope[block.Index] = props;
Level lvl = Player.IsSuper(p) ? null : p.level; Level lvl = Player.IsSuper(p) ? null : p.level;
Player.Message(p, "Block {0} is {1}: {2}", Player.Message(p, "Block {0} is {1}: {2}",
BlockName(scope, lvl, block), BlockName(scope, lvl, block),
type, getter(props) ? "&aYes" : "&cNo"); type, toggled ? "&aYes" : "&cNo");
OnPropsChanged(scope, lvl, block); OnPropsChanged(scope, lvl, block);
} }