AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reduce IL size of CmdBlockProperties.SetProperty by 317 bytes

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-22 12:04:57 +10:00
parent 46c571e7f0
commit 69dd9d7d89
2 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
MCGalaxy/Commands/World/CmdBlockProperties.cs
View File

@ -99,55 +99,44 @@ namespace MCGalaxy.Commands.World {
void SetProperty(Player p, BlockProps[] scope, ExtBlock block,
string prop, string[] args) {
int i = GetIndex(scope, block);
string text = args.Length > 3 ? args[3] : null;
if (prop == "portal") {
scope[i].IsPortal = !scope[i].IsPortal;
OnToggleSet(p, scope, block, "a portal", scope[i].IsPortal);
Toggle(p, scope, block, "a portal", ref scope[i].IsPortal);
} else if (prop == "mb" || prop == "messageblock") {
scope[i].IsMessageBlock = !scope[i].IsMessageBlock;
OnToggleSet(p, scope, block, "a message block", scope[i].IsMessageBlock);
Toggle(p, scope, block, "a message block", ref scope[i].IsMessageBlock);
} else if (prop == "rails") {
scope[i].IsRails = !scope[i].IsRails;
OnToggleSet(p, scope, block, "train rails", scope[i].IsRails);
Toggle(p, scope, block, "train rails", ref scope[i].IsRails);
} else if (prop == "waterkills") {
scope[i].WaterKills = !scope[i].WaterKills;
OnToggleSet(p, scope, block, "killed by water", scope[i].WaterKills);
Toggle(p, scope, block, "killed by water", ref scope[i].WaterKills);
} else if (prop == "lavakills") {
scope[i].LavaKills = !scope[i].LavaKills;
OnToggleSet(p, scope, block, "killed by lava", scope[i].LavaKills);
Toggle(p, scope, block, "killed by lava", ref scope[i].LavaKills);
} else if (prop == "door") {
scope[i].IsDoor = !scope[i].IsDoor;
OnToggleSet(p, scope, block, "a door", scope[i].IsDoor);
Toggle(p, scope, block, "a door", ref scope[i].IsDoor);
} else if (prop == "tdoor") {
scope[i].IsTDoor = !scope[i].IsTDoor;
OnToggleSet(p, scope, block, "a tdoor", scope[i].IsTDoor);
Toggle(p, scope, block, "a tdoor", ref scope[i].IsTDoor);
} else if (prop == "killer" || prop == "death") {
scope[i].KillerBlock = !scope[i].KillerBlock;
OnToggleSet(p, scope, block, "a killer block", scope[i].KillerBlock);
Toggle(p, scope, block, "a killer block", ref scope[i].KillerBlock);
} else if (prop == "deathmsg" || prop == "deathmessage") {
string msg = args.Length > 3 ? args[3] : null;
SetDeathMessage(p, scope, block, i, msg);
SetDeathMessage(p, scope, block, i, text);
} else if (prop == "animalai" || prop == "animal") {
string msg = args.Length > 3 ? args[3] : null;
SetEnum(p, scope, block, i, msg);
SetEnum(p, scope, block, i, text);
} else if (prop == "stackid" || prop == "stackblock") {
string msg = args.Length > 3 ? args[3] : null;
SetStackId(p, scope, block, i, msg);
SetStackId(p, scope, block, i, text);
} else if (prop == "opblock" || prop == "op") {
scope[i].OPBlock = !scope[i].OPBlock;
OnToggleSet(p, scope, block, "an OP block", scope[i].OPBlock);
Toggle(p, scope, block, "an OP block", ref scope[i].OPBlock);
} else if (prop == "odoor") {
string odoor = args.Length > 3 ? args[3] : null;
SetODoor(p, scope, block, i, odoor);
SetODoor(p, scope, block, i, text);
} else if (prop == "drownable" || prop == "drown") {
scope[i].Drownable = !scope[i].Drownable;
OnToggleSet(p, scope, block, "drowns players", scope[i].Drownable);
Toggle(p, scope, block, "drowns players", ref scope[i].Drownable);
} else {
Help(p);
}
}
static void OnToggleSet(Player p, BlockProps[] scope, ExtBlock block, string type, bool on) {
static void Toggle(Player p, BlockProps[] scope, ExtBlock block, string type, ref bool on) {
on = !on;
Level lvl = Player.IsSuper(p) ? null : p.level;
Player.Message(p, "Block {0} is {1}: {2}",
BlockName(scope, lvl, block),

13
MCGalaxy/Commands/building/ReplaceCmd.cs
View File

@ -25,15 +25,8 @@ namespace MCGalaxy.Commands.Building {
public override string name { get { return "Replace"; } }
public override string shortcut { get { return "r"; } }
public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } }
protected virtual bool ReplaceNot { get { return false; } }
protected override DrawOp GetDrawOp(DrawArgs dArgs) {
return new CuboidDrawOp();
}
protected override string GetBrush(DrawArgs dArgs, ref int offset) {
return ReplaceNot ? "replacenot" : "replace";
}
protected override DrawOp GetDrawOp(DrawArgs dArgs) { return new CuboidDrawOp(); }
protected override string GetBrush(DrawArgs dArgs, ref int offset) { return "replace"; }
public override void Help(Player p) {
Player.Message(p, "%T/Replace [block] [block2].. [new]");
@ -46,7 +39,7 @@ namespace MCGalaxy.Commands.Building {
public sealed class CmdReplaceNot : CmdReplace {
public override string name { get { return "ReplaceNot"; } }
public override string shortcut { get { return "rn"; } }
protected override bool ReplaceNot { get { return true; } }
protected override string GetBrush(DrawArgs dArgs, ref int offset) { return "replacenot"; }
public override void Help(Player p) {
Player.Message(p, "%T/ReplaceNot [block] [block2].. [new]");