Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
c3d1618ba8 | |||
|
37fdb9c12a | ||
|
e7a3db19aa | ||
|
ca4753673d | ||
|
0124aa723d | ||
|
afbc54758c |
@@ -7,11 +7,6 @@ stages:
|
|||||||
- pre-release
|
- pre-release
|
||||||
- release
|
- release
|
||||||
|
|
||||||
default:
|
|
||||||
tags:
|
|
||||||
- linux
|
|
||||||
- timvisee-linux
|
|
||||||
|
|
||||||
# Variable defaults
|
# Variable defaults
|
||||||
variables:
|
variables:
|
||||||
RUST_VERSION: stable
|
RUST_VERSION: stable
|
||||||
|
@@ -50,7 +50,7 @@ dotenv = "0.15"
|
|||||||
flate2 = { version = "1.0", default-features = false, features = ["default"] }
|
flate2 = { version = "1.0", default-features = false, features = ["default"] }
|
||||||
futures = { version = "0.3", default-features = false, features = ["executor"] }
|
futures = { version = "0.3", default-features = false, features = ["executor"] }
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
minecraft-protocol = { git = "https://github.com/timvisee/rust-minecraft-protocol", rev = "edfdf87" }
|
minecraft-protocol = { git = "https://git.cozy.software/slime/rust-minecraft-protocol", rev = "4d9c0d4305" }
|
||||||
named-binary-tag = "0.6"
|
named-binary-tag = "0.6"
|
||||||
nix = "0.26"
|
nix = "0.26"
|
||||||
notify = "4.0"
|
notify = "4.0"
|
||||||
|
@@ -57,13 +57,13 @@ pub async fn monitor_server(config: Arc<Config>, server: Arc<Server>) {
|
|||||||
|
|
||||||
// Sleep server when it's bedtime
|
// Sleep server when it's bedtime
|
||||||
if server.should_sleep(&config).await {
|
if server.should_sleep(&config).await {
|
||||||
info!(target: "lazymc::montior", "Server has been idle, sleeping...");
|
info!(target: "lazymc::monitor", "Server has been idle, sleeping...");
|
||||||
server.stop(&config).await;
|
server.stop(&config).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check whether we should force kill server
|
// Check whether we should force kill server
|
||||||
if server.should_kill().await {
|
if server.should_kill().await {
|
||||||
error!(target: "lazymc::montior", "Force killing server, took too long to start or stop");
|
error!(target: "lazymc::monitor", "Force killing server, took too long to start or stop");
|
||||||
if !server.force_kill().await {
|
if !server.force_kill().await {
|
||||||
warn!(target: "lazymc", "Failed to force kill server");
|
warn!(target: "lazymc", "Failed to force kill server");
|
||||||
}
|
}
|
||||||
|
@@ -70,7 +70,7 @@ async fn send_v1_16_3(
|
|||||||
packet::write_packet(
|
packet::write_packet(
|
||||||
Title {
|
Title {
|
||||||
action: if title.is_empty() && subtitle.is_empty() {
|
action: if title.is_empty() && subtitle.is_empty() {
|
||||||
// Defaults: https://minecraft.fandom.com/wiki/Commands/title#Detail
|
// Defaults: https://minecraft.wiki/w/Commands/title#Detail
|
||||||
TitleAction::SetTimesAndDisplay {
|
TitleAction::SetTimesAndDisplay {
|
||||||
fade_in: 10,
|
fade_in: 10,
|
||||||
stay: 70,
|
stay: 70,
|
||||||
@@ -121,7 +121,7 @@ async fn send_v1_17(
|
|||||||
// Set title times
|
// Set title times
|
||||||
packet::write_packet(
|
packet::write_packet(
|
||||||
if title.is_empty() && subtitle.is_empty() {
|
if title.is_empty() && subtitle.is_empty() {
|
||||||
// Defaults: https://minecraft.fandom.com/wiki/Commands/title#Detail
|
// Defaults: https://minecraft.wiki/w/Commands/title#Detail
|
||||||
SetTitleTimes {
|
SetTitleTimes {
|
||||||
fade_in: 10,
|
fade_in: 10,
|
||||||
stay: 70,
|
stay: 70,
|
||||||
|
@@ -232,11 +232,11 @@ async fn server_status(client_info: &ClientInfo, config: &Config, server: &Serve
|
|||||||
if config.motd.from_server && status.is_some() {
|
if config.motd.from_server && status.is_some() {
|
||||||
status.as_ref().unwrap().description.clone()
|
status.as_ref().unwrap().description.clone()
|
||||||
} else {
|
} else {
|
||||||
Message::new(Payload::text(match server_state {
|
match server_state {
|
||||||
server::State::Stopped | server::State::Started => &config.motd.sleeping,
|
server::State::Stopped | server::State::Started => &config.motd.sleeping,
|
||||||
server::State::Starting => &config.motd.starting,
|
server::State::Starting => &config.motd.starting,
|
||||||
server::State::Stopping => &config.motd.stopping,
|
server::State::Stopping => &config.motd.stopping,
|
||||||
}))
|
}.to_string()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user