Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
Sam
2022-01-22 02:13:47 -05:00
parent d436362a8d
commit cb04433c14
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/comp/inventory/item/mod.rs
View File

@ -839,12 +839,7 @@ impl Item {
self.slots.iter_mut().filter_map(mem::take) self.slots.iter_mut().filter_map(mem::take)
} }
pub fn item_definition_id(&self) -> &str { pub fn item_definition_id(&self) -> &str { self.item_base.item_definition_id() }
match &self.item_base {
ItemBase::Raw(item_def) => &item_def.item_definition_id,
ItemBase::Modular(mod_base) => mod_base.pseudo_item_id(),
}
}
pub fn is_same_item_def(&self, item_def: &ItemDef) -> bool { pub fn is_same_item_def(&self, item_def: &ItemDef) -> bool {
if let ItemBase::Raw(self_def) = &self.item_base { if let ItemBase::Raw(self_def) = &self.item_base {

0
server/src/migrations/V47__modular_weapons.sql → server/src/migrations/V49__modular_weapons.sql
View File