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

Remove auto updating, because this is not compatible with most environments.

Browse Source
This commit is contained in:
UnknownShadow200 2017-07-15 14:53:46 +10:00
parent 4c1ae27bc1
commit b548011beb
4 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GUI/PropertyWindow/PropertyWindow.Designer.cs generated
View File

@ -242,7 +242,6 @@ namespace MCGalaxy.Gui
this.updateTimeNumeric = new System.Windows.Forms.NumericUpDown(); this.updateTimeNumeric = new System.Windows.Forms.NumericUpDown();
this.lblUpdateSeconds = new System.Windows.Forms.Label(); this.lblUpdateSeconds = new System.Windows.Forms.Label();
this.notifyInGameUpdate = new System.Windows.Forms.CheckBox(); this.notifyInGameUpdate = new System.Windows.Forms.CheckBox();
this.autoUpdate = new System.Windows.Forms.CheckBox();
this.chkUpdates = new System.Windows.Forms.CheckBox(); this.chkUpdates = new System.Windows.Forms.CheckBox();
this.grpPlayers = new System.Windows.Forms.GroupBox(); this.grpPlayers = new System.Windows.Forms.GroupBox();
this.srv_lblPlayers = new System.Windows.Forms.Label(); this.srv_lblPlayers = new System.Windows.Forms.Label();
@ -2515,7 +2514,6 @@ namespace MCGalaxy.Gui
this.srv_grpUpdate.Controls.Add(this.updateTimeNumeric); this.srv_grpUpdate.Controls.Add(this.updateTimeNumeric);
this.srv_grpUpdate.Controls.Add(this.lblUpdateSeconds); this.srv_grpUpdate.Controls.Add(this.lblUpdateSeconds);
this.srv_grpUpdate.Controls.Add(this.notifyInGameUpdate); this.srv_grpUpdate.Controls.Add(this.notifyInGameUpdate);
this.srv_grpUpdate.Controls.Add(this.autoUpdate);
this.srv_grpUpdate.Controls.Add(this.chkUpdates); this.srv_grpUpdate.Controls.Add(this.chkUpdates);
this.srv_grpUpdate.Location = new System.Drawing.Point(220, 271); this.srv_grpUpdate.Location = new System.Drawing.Point(220, 271);
this.srv_grpUpdate.Name = "srv_grpUpdate"; this.srv_grpUpdate.Name = "srv_grpUpdate";
@ -2572,16 +2570,6 @@ namespace MCGalaxy.Gui
this.notifyInGameUpdate.Text = "Notify In-Game"; this.notifyInGameUpdate.Text = "Notify In-Game";
this.notifyInGameUpdate.UseVisualStyleBackColor = true; this.notifyInGameUpdate.UseVisualStyleBackColor = true;
// //
// autoUpdate
//
this.autoUpdate.AutoSize = true;
this.autoUpdate.Location = new System.Drawing.Point(6, 68);
this.autoUpdate.Name = "autoUpdate";
this.autoUpdate.Size = new System.Drawing.Size(85, 17);
this.autoUpdate.TabIndex = 6;
this.autoUpdate.Text = "Auto Update";
this.autoUpdate.UseVisualStyleBackColor = true;
//
// chkUpdates // chkUpdates
// //
this.chkUpdates.AutoSize = true; this.chkUpdates.AutoSize = true;
@ -4643,7 +4631,6 @@ namespace MCGalaxy.Gui
private System.Windows.Forms.TextBox sql_txtPort; private System.Windows.Forms.TextBox sql_txtPort;
private System.Windows.Forms.Label sql_lblPort; private System.Windows.Forms.Label sql_lblPort;
private System.Windows.Forms.GroupBox srv_grpUpdate; private System.Windows.Forms.GroupBox srv_grpUpdate;
private System.Windows.Forms.CheckBox autoUpdate;
private System.Windows.Forms.NumericUpDown updateTimeNumeric; private System.Windows.Forms.NumericUpDown updateTimeNumeric;
private System.Windows.Forms.Label lblUpdateSeconds; private System.Windows.Forms.Label lblUpdateSeconds;
private System.Windows.Forms.CheckBox notifyInGameUpdate; private System.Windows.Forms.CheckBox notifyInGameUpdate;

4
GUI/PropertyWindow/PropertyWindow.General.cs
View File

@ -42,7 +42,6 @@ namespace MCGalaxy.Gui {
adv_chkRestart.Checked = ServerConfig.restartOnError; adv_chkRestart.Checked = ServerConfig.restartOnError;
chkUpdates.Checked = ServerConfig.CheckForUpdates; chkUpdates.Checked = ServerConfig.CheckForUpdates;
autoUpdate.Checked = ServerConfig.AutoUpdate;
notifyInGameUpdate.Checked = ServerConfig.NotifyUpdating; notifyInGameUpdate.Checked = ServerConfig.NotifyUpdating;
updateTimeNumeric.Value = ServerConfig.UpdateRestartDelay; updateTimeNumeric.Value = ServerConfig.UpdateRestartDelay;
} }
@ -66,8 +65,7 @@ namespace MCGalaxy.Gui {
ServerConfig.VerifyNames = adv_chkVerify.Checked; ServerConfig.VerifyNames = adv_chkVerify.Checked;
ServerConfig.restartOnError = adv_chkRestart.Checked; ServerConfig.restartOnError = adv_chkRestart.Checked;
ServerConfig.CheckForUpdates = chkUpdates.Checked; ServerConfig.CheckForUpdates = chkUpdates.Checked;
ServerConfig.AutoUpdate = autoUpdate.Checked;
ServerConfig.NotifyUpdating = notifyInGameUpdate.Checked; ServerConfig.NotifyUpdating = notifyInGameUpdate.Checked;
ServerConfig.UpdateRestartDelay = (int)updateTimeNumeric.Value; ServerConfig.UpdateRestartDelay = (int)updateTimeNumeric.Value;
//ServerConfig.reportBack = ; //No setting for this? //ServerConfig.reportBack = ; //No setting for this?

2
MCGalaxy/Server/ServerConfig.cs
View File

@ -75,8 +75,6 @@ namespace MCGalaxy {
[ConfigBool("check-updates", "Update", false)] [ConfigBool("check-updates", "Update", false)]
public static bool CheckForUpdates = true; public static bool CheckForUpdates = true;
[ConfigBool("auto-update", "Update", false)]
public static bool AutoUpdate;
[ConfigBool("in-game-update-notify", "Server", false)] [ConfigBool("in-game-update-notify", "Server", false)]
public static bool NotifyUpdating; public static bool NotifyUpdating;
[ConfigInt("update-countdown", "Update", 10)] [ConfigInt("update-countdown", "Update", 10)]

4
MCGalaxy/Server/Updater.cs
View File

@ -56,7 +56,7 @@ namespace MCGalaxy {
return; return;
} }
if (ServerConfig.AutoUpdate || p != null) { if (p != null) {
if (ServerConfig.NotifyUpdating || p != null) { if (ServerConfig.NotifyUpdating || p != null) {
NotifyPlayersOfUpdate(p); NotifyPlayersOfUpdate(p);
} else { } else {
@ -101,7 +101,7 @@ namespace MCGalaxy {
countDown.Start(); countDown.Start();
countDown.Elapsed += delegate { countDown.Elapsed += delegate {
if (ServerConfig.AutoUpdate || p != null) { if (p != null) {
Chat.MessageAll("Updating in &f" + timeLeft + " %Sseconds."); Chat.MessageAll("Updating in &f" + timeLeft + " %Sseconds.");
Logger.Log(LogType.SystemActivity, "Updating in {0} seconds.", timeLeft); Logger.Log(LogType.SystemActivity, "Updating in {0} seconds.", timeLeft);