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

don't pointlesss reference Server.lava

Browse Source
This commit is contained in:
UnknownShadow200 2017-07-16 14:08:36 +10:00
parent 6c456e9500
commit 8643ca1434
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MCGalaxy/Games/LavaSurvival/LavaSurvival.Game.cs
View File

@ -42,13 +42,13 @@ namespace MCGalaxy.Games {
}
public override void PlayerJoinedLevel(Player p, Level lvl, Level oldLevl) {
if (Server.lava.active && !Server.lava.sendingPlayers && Server.lava.map == lvl) {
if (Server.lava.roundActive) {
Server.lava.AnnounceRoundInfo(p);
Server.lava.AnnounceTimeLeft(!Server.lava.flooded, true, p);
if (active && !sendingPlayers && map == lvl) {
if (roundActive) {
AnnounceRoundInfo(p);
AnnounceTimeLeft(!flooded, true, p);
} else {
Player.Message(p, "Vote for the next map!");
Player.Message(p, "Choices: " + Server.lava.VoteString);
Player.Message(p, "Choices: " + VoteString);
}
}
}

2
MCGalaxy/Network/IRCPlugin/IRCPlugin.cs
View File

@ -115,7 +115,7 @@ namespace MCGalaxy.Network {
void HandleChat(Player p, string message) {
if (!Server.IRC.Enabled) return;
if (message.Trim(trimChars) == "") return;
if (p.cancelchat) return;
if (p.cancelchat || !p.level.SeesServerWideChat) return;
string name = ServerConfig.IRCShowPlayerTitles ? p.FullName : p.group.Prefix + p.ColoredName;
Bot.Say(name + "%S: " + message, p.opchat);