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

Merge branch 'sam/use-lottery-result' into 'master'

Browse Source 
Handled error in setting stack size for item quantity in lottery.

See merge request veloren/veloren!2055
This commit is contained in:
Joshua Yanovski 2021-04-03 20:11:12 +00:00
commit 143fe3876d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/lottery.rs
View File

@ -32,6 +32,7 @@ use crate::{
};
use rand::prelude::*;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use tracing::warn;
#[derive(Clone, Debug, PartialEq, Deserialize)]
pub struct Lottery<T> {
@ -93,7 +94,10 @@ impl LootSpec {
let range = *lower..=*upper;
let quantity = thread_rng().gen_range(range);
let mut item = Item::new_from_asset_expect(&item);
let _ = item.set_amount(quantity);
// TODO: Handle multiple of an item that is unstackable
if item.set_amount(quantity).is_err() {
warn!("Tried to set quantity on non stackable item");
}
item
},
Self::LootTable(table) => Lottery::<LootSpec>::load_expect(&table)