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

Fixes #2411

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-10-14 00:51:21 +02:00
parent 50e926d18a
commit 1ffe2fd493
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -89,6 +89,7 @@
* Fixed #2414
* Fixed #2454
* Fixed #2457
* Fixed #2411
## Release Candidate 16 (07 Sep 2020)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16

4
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/AbstractEnergyProvider.java
View File

@ -8,6 +8,7 @@ import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.commons.lang.Validate;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@ -89,11 +90,12 @@ public abstract class AbstractEnergyProvider extends SlimefunItem implements Inv
}
public void registerFuel(@Nonnull MachineFuel fuel) {
Validate.notNull(fuel, "Machine Fuel cannot be null!");
fuelTypes.add(fuel);
}
@Nonnull
public Set<MachineFuel> getFuelTypes() {
public Set<MachineFuel> getFuelTypes2() {
return fuelTypes;
}

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/CoalGenerator.java
View File

@ -74,7 +74,7 @@ public abstract class CoalGenerator extends AGenerator {
}
// Signs
for (Material mat : Tag.SIGNS.getValues()) {
for (Material mat : Tag.STANDING_SIGNS.getValues()) {
registerFuel(new MachineFuel(2, new ItemStack(mat)));
}
}