Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit 3bbbc42

Browse files
committed
Language-standard naming.
Removed some old debug code. Logging statements cleaned up and corrected.
1 parent 5cc6bad commit 3bbbc42

File tree

1 file changed

+17
-27
lines changed

1 file changed

+17
-27
lines changed

EssentialsPlugin/ProcessHandlers/ProcessGreeting.cs

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@
1010

1111
class GreetingItem
1212
{
13-
private DateTime start;
13+
private DateTime _start;
1414
public DateTime Start
1515
{
16-
get { return start; }
17-
set { start = value; }
16+
get { return _start; }
17+
set { _start = value; }
1818
}
1919

20-
private ulong steamId;
20+
private ulong _steamId;
2121
public ulong SteamId
2222
{
23-
get { return steamId; }
24-
set { steamId = value; }
23+
get { return _steamId; }
24+
set { _steamId = value; }
2525
}
2626

27-
private TimeSpan timeout;
27+
private TimeSpan _timeout;
2828
public TimeSpan Timeout
2929
{
30-
get { return timeout; }
31-
set { timeout = value; }
30+
get { return _timeout; }
31+
set { _timeout = value; }
3232
}
3333

34-
private bool isNewUser;
34+
private bool _isNewUser;
3535
public bool IsNewUser
3636
{
37-
get { return isNewUser; }
38-
set { isNewUser = value; }
37+
get { return _isNewUser; }
38+
set { _isNewUser = value; }
3939
}
4040
}
4141

@@ -56,11 +56,9 @@ public override void Handle()
5656
if (MyAPIGateway.Players == null)
5757
return;
5858

59-
int pos = 0;
6059
try
6160
{
6261
List<IMyPlayer> players = new List<IMyPlayer>();
63-
pos = 1;
6462
bool result = false;
6563
Wrapper.GameAction(() =>
6664
{
@@ -78,27 +76,22 @@ public override void Handle()
7876
if(!result)
7977
return;
8078

81-
pos = 2;
8279
lock (m_greetingList)
8380
{
8481
for (int r = m_greetingList.Count - 1; r >= 0; r--)
8582
{
86-
pos = 3;
8783
GreetingItem item = m_greetingList[r];
8884
if(DateTime.Now - item.Start > item.Timeout)
8985
{
9086
m_greetingList.RemoveAt(r);
9187
continue;
9288
}
93-
pos = 4;
9489
IMyPlayer player = players.FirstOrDefault(x => x.SteamUserId == item.SteamId && x.Controller != null && x.Controller.ControlledEntity != null);
95-
pos = 5;
9690
if (player != null)
9791
{
98-
pos = 6;
9992
m_greetingList.RemoveAt(r);
10093

101-
string message = "";
94+
string message;
10295

10396
if (item.IsNewUser)
10497
message = PluginSettings.Instance.GreetingNewUserMessage.Replace("%name%", player.DisplayName);
@@ -135,14 +128,11 @@ public override void Handle()
135128

136129
}
137130
}
138-
139-
pos = 7;
140-
141131
}
142132
}
143133
catch (Exception ex)
144134
{
145-
Log.Info(string.Format("Handle(): Error at pos - {0}: {1}", pos, ex.ToString()));
135+
Log.Error( ex );
146136
}
147137
}
148138

@@ -157,12 +147,12 @@ public override void OnPlayerJoined(ulong remoteUserId)
157147
item.Start = DateTime.Now;
158148
item.IsNewUser = !PlayerMap.Instance.GetPlayerIdsFromSteamId(remoteUserId).Any();
159149

160-
Log.Info(string.Format("New User: {0}", remoteUserId));
150+
Log.Info( "New User: {0}", remoteUserId );
161151

162152
lock (m_greetingList)
163153
{
164154
m_greetingList.Add(item);
165-
Log.Info(string.Format("Greeting Added => {0} (New user: {1})", remoteUserId, item.IsNewUser));
155+
Log.Info( "Greeting Added => {0} (New user: {1})", remoteUserId, item.IsNewUser );
166156
}
167157

168158
base.OnPlayerJoined(remoteUserId);
@@ -174,7 +164,7 @@ public override void OnPlayerLeft(ulong remoteUserId)
174164
{
175165
if (m_greetingList.Find(x => x.SteamId == remoteUserId) != null)
176166
{
177-
Log.Info(string.Format("Greeting Removed => {0}", remoteUserId));
167+
Log.Info( "Greeting Removed => {0}", remoteUserId );
178168
m_greetingList.RemoveAll(x => x.SteamId == remoteUserId);
179169
}
180170
}

0 commit comments

Comments
 (0)