5 commits

Author	SHA1	Message	Date
Mariell Hoversholm	9889c651ce	apply fixup ... I managed to move it, yet forgot to actually fix it up...	2021-03-19 07:54:18 +01:00
Mariell Hoversholm	1034873dfa	Apply fixups	2021-03-18 18:03:22 +01:00
Mariell Hoversholm	0f78e95250	More work	2021-03-18 18:03:22 +01:00
Riley Park	4e958e229f	We're going on an Adventure! (#4842) ... Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: zml <zml@stellardrift.ca> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>	2021-02-21 20:45:33 +01:00
Jason	bd7c1d88b1	Merchant#getRecipes should return an immutable list (#5183) ... This fixes a confusing issue where doing 'merchant.setRecipes(merchant.getRecipes());' would clear the merchants recipes, as the implementation of getRecipes is guavas Lists.transform wrapped in Collections.unmodifiableList, and the implementation of setRecipes clears the backing list before adding the elements of the provided list to the backing list. The javadoc for the getRecipes method says 'an immutable list of trades', so this patch makes the javadoc correct.	2021-02-10 23:06:34 +00:00