AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-29 08:32:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix players being announced on IRC when admins-join-silent is set to true. (Thanks venom983)

Browse Source
This commit is contained in:
UnknownShadow200 2016-02-10 23:36:18 +11:00
parent fddbd360d9
commit df3ee22bba
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRC/ForgeBot.cs
View File

@ -148,6 +148,7 @@ namespace MCGalaxy {
void Player_PlayerConnect(Player p) { void Player_PlayerConnect(Player p) {
if (!Server.irc || !IsConnected()) return; if (!Server.irc || !IsConnected()) return;
if (!Server.guestJoinNotify && p.group.Permission <= LevelPermission.Guest) return; if (!Server.guestJoinNotify && p.group.Permission <= LevelPermission.Guest) return;
if (!p.hidden)
connection.Sender.PublicMessage(channel, p.name + " joined the game"); connection.Sender.PublicMessage(channel, p.name + " joined the game");
} }

39
Player/Player.cs
View File

@ -760,15 +760,9 @@ namespace MCGalaxy {
SetPrefix(); SetPrefix();
playerDb.Dispose(); playerDb.Dispose();
if (PlayerConnect != null)
PlayerConnect(this);
OnPlayerConnectEvent.Call(this);
if (Server.server_owner != "" && Server.server_owner.ToLower().Equals(name.ToLower())) { if (Server.server_owner != "" && Server.server_owner.ToLower().Equals(name.ToLower())) {
if (color == Group.standard.color) if (color == Group.standard.color) color = "&c";
color = "&c"; if (title == "") title = "Owner";
if (title == "")
title = "Owner";
SetPrefix(); SetPrefix();
} }
@ -780,8 +774,22 @@ namespace MCGalaxy {
if (!File.Exists("text/login/" + this.name + ".txt")) if (!File.Exists("text/login/" + this.name + ".txt"))
CP437Writer.WriteAllText("text/login/" + this.name + ".txt", "joined the server."); CP437Writer.WriteAllText("text/login/" + this.name + ".txt", "joined the server.");
CheckLoginJailed(); string joinm = "&a+ " + this.FullName + Server.DefaultColor + " " + File.ReadAllText("text/login/" + this.name + ".txt");
if (group.Permission < Server.adminchatperm || !Server.adminsjoinsilent) {
if ((Server.guestJoinNotify && group.Permission <= LevelPermission.Guest) || group.Permission > LevelPermission.Guest) {
PlayerInfo.players.ForEach(p1 => Player.SendMessage(p1, joinm));
}
}
if (group.Permission >= Server.adminchatperm && Server.adminsjoinsilent) {
hidden = true;
adminchat = true;
}
if (PlayerConnect != null)
PlayerConnect(this);
OnPlayerConnectEvent.Call(this);
CheckLoginJailed();
if (Server.agreetorulesonentry) { if (Server.agreetorulesonentry) {
if (!File.Exists("ranks/agreed.txt")) if (!File.Exists("ranks/agreed.txt"))
File.WriteAllText("ranks/agreed.txt", ""); File.WriteAllText("ranks/agreed.txt", "");
@ -792,19 +800,6 @@ namespace MCGalaxy {
} }
} }
string joinm = "&a+ " + this.FullName + Server.DefaultColor + " " + File.ReadAllText("text/login/" + this.name + ".txt");
if (group.Permission < Server.adminchatperm || Server.adminsjoinsilent == false)
{
if ((Server.guestJoinNotify && group.Permission <= LevelPermission.Guest) || group.Permission > LevelPermission.Guest)
{
PlayerInfo.players.ForEach(p1 => Player.SendMessage(p1, joinm));
}
}
if (group.Permission >= Server.adminchatperm && Server.adminsjoinsilent) {
hidden = true;
adminchat = true;
}
if (Server.verifyadmins && group.Permission >= Server.verifyadminsrank) { if (Server.verifyadmins && group.Permission >= Server.verifyadminsrank) {
if (!Directory.Exists("extra/passwords") || !File.Exists("extra/passwords/" + this.name + ".dat")) if (!Directory.Exists("extra/passwords") || !File.Exists("extra/passwords/" + this.name + ".dat"))
SendMessage("&cPlease set your admin verification password with &a/setpass [Password]!"); SendMessage("&cPlease set your admin verification password with &a/setpass [Password]!");