Skip to content

Commit 212ac35

Browse files
String -> string
1 parent e09007a commit 212ac35

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

fCraft/Commands/ModerationCommands.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ internal static void Init() {
7272

7373
static void CalcHandler(Player player, CommandReader cmd)
7474
{
75-
String numberone = cmd.Next();
76-
String op = cmd.Next();
77-
String numbertwo = cmd.Next();
75+
string numberone = cmd.Next();
76+
string op = cmd.Next();
77+
string numbertwo = cmd.Next();
7878
double no1 = 1;
7979
double no2 = 1;
8080

@@ -1108,7 +1108,7 @@ static void HideHandler([NotNull] Player player, [NotNull] CommandReader cmd) {
11081108

11091109
// to make it look like player just logged out in /Info
11101110
player.Info.LastSeen = DateTime.UtcNow;
1111-
String quitMessage = (silentString.Length < 1 ? "" : "/Quit " + (silentString.Length > 64 ? silentString.Remove(64) : silentString));
1111+
string quitMessage = (silentString.Length < 1 ? "" : "/Quit " + (silentString.Length > 64 ? silentString.Remove(64) : silentString));
11121112

11131113
if (!silent && ConfigKey.ShowConnectionMessages.Enabled()) {
11141114
if (!quitMessage.Equals("")) {

fCraft/Player/Player.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public sealed partial class Player : IClassy {
5959
public int MessageSpam { get; set; }
6060

6161
/// <summary> Last sign clicked by the player</summary>
62-
public String LastSignClicked;
62+
public string LastSignClicked;
6363

6464
/// <summary> Whether the player has completed the login sequence. </summary>
6565
public SessionState State { get; private set; }

fCraft/Player/PlayerInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static void CheckPaidStatusCallback( SchedulerTask task ) {
102102

103103
/// <summary> Begins to asynchronously check player's account type. </summary>
104104
public void GeoipLogin() {
105-
String ip = LastIP.ToString();
105+
string ip = LastIP.ToString();
106106
if (IPAddress.Parse(ip).IsLocal() && Server.ExternalIP != null) {
107107
ip = Server.ExternalIP.ToString();
108108
}

fCraft/Plugins/Plugin.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ namespace fCraft {
3131

3232
public interface Plugin {
3333

34-
String Name { get; set; }
34+
string Name { get; set; }
3535

36-
String Version { get; set; }
36+
string Version { get; set; }
3737

3838
void Initialize();
3939
}

fCraft/Plugins/PluginConfig.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ namespace fCraft {
55

66
public abstract class PluginConfig {
77

8-
public virtual void Save( Plugin plugin, String file ) {
8+
public virtual void Save( Plugin plugin, string file ) {
99
// Append plugin directory
10-
String realFile = "plugins/" + plugin.Name + "/" + file;
10+
string realFile = "plugins/" + plugin.Name + "/" + file;
1111
PluginConfigSerializer.Serialize( realFile, this );
1212
}
1313

14-
public virtual PluginConfig Load( Plugin plugin, String file, Type type ) {
14+
public virtual PluginConfig Load( Plugin plugin, string file, Type type ) {
1515
// Append plugin directory
16-
String realFile = "plugins/" + plugin.Name + "/" + file;
16+
string realFile = "plugins/" + plugin.Name + "/" + file;
1717

1818
if ( !Directory.Exists( "plugins/" + plugin.Name ) ) {
1919
Directory.CreateDirectory( "plugins/" + plugin.Name );

fCraft/Plugins/PluginConfigSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ namespace fCraft {
66

77
public class PluginConfigSerializer {
88

9-
public static void Serialize( String configFile, PluginConfig config ) {
9+
public static void Serialize( string configFile, PluginConfig config ) {
1010
XmlSerializer xs = new XmlSerializer( config.GetType() );
1111
StreamWriter writer = File.CreateText( configFile );
1212
xs.Serialize( writer, config );
1313
writer.Flush();
1414
writer.Close();
1515
}
1616

17-
public static PluginConfig Deserialize( String configFile, Type type ) {
17+
public static PluginConfig Deserialize( string configFile, Type type ) {
1818
XmlSerializer xs = new XmlSerializer( type );
1919
StreamReader reader = File.OpenText( configFile );
2020
PluginConfig c = ( PluginConfig )xs.Deserialize( reader );

fCraft/Portals/Portal.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public bool IsInRange(Vector3I vector) {
7777
return false;
7878
}
7979

80-
public static String GenerateName(World world) {
80+
public static string GenerateName(World world) {
8181
if (world.Portals != null) {
8282
if (world.Portals.Count > 0) {
8383
bool found = false;
@@ -107,7 +107,7 @@ public static String GenerateName(World world) {
107107
return "portal1";
108108
}
109109

110-
public static bool DoesNameExist(World world, String name) {
110+
public static bool DoesNameExist(World world, string name) {
111111
if (world.Portals != null) {
112112
if (world.Portals.Count > 0) {
113113
foreach (Portal portal in world.Portals) {

fCraft/Portals/PortalDB.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static void Load() {
6363
try {
6464
lock (IOLock) {
6565
using (StreamReader r = new StreamReader(Paths.PortalDBFileName)) {
66-
String line;
66+
string line;
6767
int count = 0;
6868

6969
while ((line = r.ReadLine()) != null) {

fCraft/Portals/PortalException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace fCraft.Portals {
2323
class PortalException : Exception {
24-
public PortalException(String message)
24+
public PortalException(string message)
2525
: base(message) {
2626
// Do nothing
2727
}

0 commit comments

Comments
 (0)