Make Icon Optional

This commit is contained in:
Alexander Medvedev
2024-08-21 15:49:28 +01:00
parent e23587b698
commit b37039126a
3 changed files with 11 additions and 5 deletions

View File

@@ -188,8 +188,8 @@ pub struct StatusResponse {
pub version: Version,
pub players: Players,
pub description: String,
pub favicon: String, // data:image/png;base64,<data>
// Players, favicon ...
pub favicon: Option<String>, // data:image/png;base64,<data>
// Players, favicon ...
}
#[derive(Serialize)]
pub struct Version {

View File

@@ -302,7 +302,7 @@ impl Client {
if config.hurt_animation {
// TODO
// thats how we prevent borrow errors :c
let packet = &CHurtAnimation::new(&entity_id, 10.0);
let packet = &CHurtAnimation::new(&entity_id, attacker_player.entity.yaw);
self.send_packet(packet);
client.send_packet(packet);
server.broadcast_packet_expect(

View File

@@ -2,6 +2,7 @@ use std::{
cell::{RefCell, RefMut},
collections::HashMap,
io::Cursor,
path::Path,
rc::Rc,
sync::{
atomic::{AtomicI32, Ordering},
@@ -408,7 +409,12 @@ impl Server {
}
pub fn build_response(config: &BasicConfiguration) -> StatusResponse {
let path = concat!(env!("CARGO_MANIFEST_DIR"), "/icon.png");
let icon_path = concat!(env!("CARGO_MANIFEST_DIR"), "/icon.png");
let icon = if Path::new(icon_path).exists() {
Some(Self::load_icon(icon_path))
} else {
None
};
StatusResponse {
version: Version {
@@ -424,7 +430,7 @@ impl Server {
}],
},
description: config.motd.clone(),
favicon: Self::load_icon(path),
favicon: icon,
}
}