Skip to content

Commit d3fd25f

Browse files
Remove unnecessary Split() calls
1 parent 48404d8 commit d3fd25f

3 files changed

Lines changed: 34 additions & 27 deletions

File tree

fCraft/Commands/CpeCommands.cs

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,17 +1588,20 @@ static void CustomBlockDefineHandler(Player p, string args, bool global, BlockDe
15881588
step = 10;
15891589
break;
15901590
}
1591-
if (args.Split().Length != 3) {
1591+
1592+
string[] minArgs = args.Split();
1593+
if (minArgs.Length != 3) {
15921594
p.Message("Please specify 3 coordinates");
15931595
return;
15941596
}
1597+
15951598
byte minx, miny, minz;
1596-
if (byte.TryParse(args.Split()[0], out minx)
1597-
&& byte.TryParse(args.Split()[1], out miny)
1598-
&& byte.TryParse(args.Split()[2], out minz)
1599-
&& (minx <= 15 && minx >= 0)
1600-
&& (miny <= 15 && miny >= 0)
1601-
&& (minz <= 15 && minz >= 0)) {
1599+
if (byte.TryParse(minArgs[0], out minx)
1600+
&& byte.TryParse(minArgs[1], out miny)
1601+
&& byte.TryParse(minArgs[2], out minz)
1602+
&& (minx >= 0 && minx <= 15)
1603+
&& (miny >= 0 && miny <= 15)
1604+
&& (minz >= 0 && minz <= 15)) {
16021605
} else {
16031606
p.Message("Invalid coordinates! All 3 must be between 0 and 15");
16041607
return;
@@ -1610,17 +1613,19 @@ static void CustomBlockDefineHandler(Player p, string args, bool global, BlockDe
16101613
p.Message(" &bSet minimum coords to X:{0} Y:{1} Z:{2}", minx, miny, minz);
16111614
break;
16121615
case 17:
1613-
if (args.Split().Length != 3) {
1616+
string[] maxArgs = args.Split();
1617+
if (maxArgs.Length != 3) {
16141618
p.Message("Please specify 3 coordinates");
16151619
return;
16161620
}
1621+
16171622
byte maxx, maxy, maxz;
1618-
if (byte.TryParse(args.Split()[0], out maxx)
1619-
&& byte.TryParse(args.Split()[1], out maxy)
1620-
&& byte.TryParse(args.Split()[2], out maxz)
1621-
&& (maxx <= 16 && maxx >= 1)
1622-
&& (maxy <= 16 && maxy >= 1)
1623-
&& (maxz <= 16 && maxz >= 1)) {
1623+
if (byte.TryParse(maxArgs[0], out maxx)
1624+
&& byte.TryParse(maxArgs[1], out maxy)
1625+
&& byte.TryParse(maxArgs[2], out maxz)
1626+
&& (maxx >= 1 && maxx <= 16)
1627+
&& (maxy >= 1 && maxy <= 16)
1628+
&& (maxz >= 1 && maxz <= 16)) {
16241629
} else {
16251630
p.Message("Invalid coordinates! All 3 must be between 1 and 16");
16261631
return;
@@ -1932,23 +1937,28 @@ static void CustomBlockEditHandler(Player p, CommandReader cmd, bool global, Blo
19321937
hasChanged = true;
19331938
break;
19341939
}
1935-
if (args.Split().Length != 3) {
1940+
1941+
string[] minArgs = args.Split();
1942+
if (minArgs.Length != 3) {
19361943
p.Message("Please specify 3 coordinates!");
19371944
break;
19381945
}
1939-
def.MinX = EditCoord(p, "min X", def.Name, args.Split()[0], def.MinX, ref hasChanged);
1940-
def.MinY = EditCoord(p, "min Y", def.Name, args.Split()[1], def.MinY, ref hasChanged);
1941-
def.MinZ = EditCoord(p, "min Z", def.Name, args.Split()[2], def.MinZ, ref hasChanged);
1946+
1947+
def.MinX = EditCoord(p, "min X", def.Name, minArgs[0], def.MinX, ref hasChanged);
1948+
def.MinY = EditCoord(p, "min Y", def.Name, minArgs[1], def.MinY, ref hasChanged);
1949+
def.MinZ = EditCoord(p, "min Z", def.Name, minArgs[2], def.MinZ, ref hasChanged);
19421950
hasChanged = true;
19431951
break;
19441952
case "max":
1945-
if (args.Split().Length != 3) {
1953+
string[] maxArgs = args.Split();
1954+
if (maxArgs.Length != 3) {
19461955
p.Message("Please specify 3 coordinates!");
19471956
break;
19481957
}
1949-
def.MaxX = EditCoord(p, "max X", def.Name, args.Split()[0], def.MaxX, ref hasChanged);
1950-
def.MaxY = EditCoord(p, "max Y", def.Name, args.Split()[1], def.MaxY, ref hasChanged);
1951-
def.MaxZ = EditCoord(p, "max Z", def.Name, args.Split()[2], def.MaxZ, ref hasChanged);
1958+
1959+
def.MaxX = EditCoord(p, "max X", def.Name, maxArgs[0], def.MaxX, ref hasChanged);
1960+
def.MaxY = EditCoord(p, "max Y", def.Name, maxArgs[1], def.MaxY, ref hasChanged);
1961+
def.MaxZ = EditCoord(p, "max Z", def.Name, maxArgs[2], def.MaxZ, ref hasChanged);
19521962
hasChanged = true;
19531963
break;
19541964
case "minx":

fCraft/System/Logger.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ internal static void MarkLogStart() {
8181
public static void LogToConsole( [NotNull] string message ) {
8282
if( message == null ) throw new ArgumentNullException( "message" );
8383
if( message.Contains( "&N" ) ) {
84-
foreach( string line in message.Split( split,
85-
StringSplitOptions.RemoveEmptyEntries ) ) {
84+
foreach( string line in message.Split( split, StringSplitOptions.RemoveEmptyEntries ) ) {
8685
LogToConsole( line );
8786
}
8887
return;

fCraft/System/Utils/Updater.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ internal ReleaseInfo( int version, int revision, DateTime releaseDate, [NotNull]
108108
Revision = revision;
109109
Date = releaseDate;
110110
Summary = summary;
111-
ChangeLog = changeLog.Split( new[] {
112-
'\n'
113-
} );
111+
ChangeLog = changeLog.Split( new[] { '\n' } );
114112
Flags = releaseType;
115113
}
116114

0 commit comments

Comments
 (0)