mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixed #3390

Browse Source
This commit is contained in:
TheBusyBiscuit 2021-12-31 18:29:21 +01:00
parent 77da680ff9
commit 8114729e16
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -1,4 +1,5 @@
# Table of contents
- [Release Candidate 31 (TBD)](#release-candidate-31-tbd)
- [Release Candidate 30 (31 Dec 2021)](#release-candidate-30-31-dec-2021)
- [Release Candidate 29 (07 Nov 2021)](#release-candidate-29-07-nov-2021)
- [Release Candidate 28 (06 Sep 2021)](#release-candidate-28-06-sep-2021)
@ -30,7 +31,17 @@
- [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019)
- [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)
## Release Candidate 31 (TBD)
#### Additions
#### Changes
#### Fixes
* Fixed #3390
## Release Candidate 30 (31 Dec 2021)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#30
#### Additions
* Added a ton of wiki links to the guide

10
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java
View File

@ -126,11 +126,13 @@ public class AutoBrewer extends AContainer implements NotHopperable {
potion.setBasePotionData(new PotionData(fermented, data.isExtended(), data.isUpgraded()));
return new ItemStack(potionType);
}
} else if (input == Material.REDSTONE && type.isExtendable()) {
potion.setBasePotionData(new PotionData(type, true, data.isUpgraded()));
} else if (input == Material.REDSTONE && type.isExtendable() && !data.isUpgraded()) {
// Fixes #3390 - Potions can only be either extended or upgraded. Not both.
potion.setBasePotionData(new PotionData(type, true, false));
return new ItemStack(potionType);
} else if (input == Material.GLOWSTONE_DUST && type.isUpgradeable()) {
potion.setBasePotionData(new PotionData(type, data.isExtended(), true));
} else if (input == Material.GLOWSTONE_DUST && type.isUpgradeable() && !data.isExtended()) {
// Fixes #3390 - Potions can only be either extended or upgraded. Not both.
potion.setBasePotionData(new PotionData(type, false, true));
return new ItemStack(potionType);
} else if (type == PotionType.AWKWARD) {
PotionType potionRecipe = potionRecipes.get(input);