mirror of
https://github.com/Pumpkin-MC/Pumpkin.git
synced 2026-08-30 20:14:23 +00:00
Make Icon Optional
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user