majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-31 20:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix damage & death msg & portal delay (#1095)

Browse Source 
* fix: damage sound & death message

* fix

* fix

* fix rustfmt

* fix: reset_state

* fix
This commit is contained in:
Liyan Zhao
2025-08-01 16:04:59 +08:00
committed by GitHub
parent 0c1f0b9a33
commit 5ea2f70dba
7 changed files with 109 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pumpkin-data/build/damage_type.rs
View File

@@ -69,9 +69,9 @@ pub(crate) fn build() -> TokenStream {
let death_message_type = match &data.death_message_type {
Some(msg) => {
let msg_ident = Ident::new(&format!("{msg:?}"), proc_macro2::Span::call_site());
quote! { Some(DeathMessageType::#msg_ident) }
quote! { DeathMessageType::#msg_ident }
}
None => quote! { None },
None => quote! { DeathMessageType::Default },
};
let effects = match &data.effects {
@@ -106,7 +106,7 @@ pub(crate) fn build() -> TokenStream {
quote! {
#[derive(Clone, Copy, Debug, PartialEq)]
pub struct DamageType {
pub death_message_type: Option<DeathMessageType>,
pub death_message_type: DeathMessageType,
pub exhaustion: f32,
pub effects: Option<DamageEffects>,
pub message_id: &'static str,