diff --git a/CHANGELOG.md b/CHANGELOG.md index 2346afa38..200be6f4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ * Fixed #2420 * Fixed #2422 * Fixed #2433 +* Fixed #2455 ## Release Candidate 16 (07 Sep 2020) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 03fd38e80..d80ac5dc6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -159,7 +159,7 @@ if (something) { // Actual code... ``` * if/else statements should always include a bracket, please avoid one-line statements. (e.g. Avoid doing: `if (x == 0) return;`) -* We do not enforce any particular width or column limit, but try to prevent your lines from becoming too long. +* We do not enforce any particular width or column limit, just try to prevent your lines from becoming too long. But please avoid line-wrapping. * Annotations for methods or fields should never go on the same line, place them on the line above. * Comments should never go on the same line as code! Always above or below. * Make sure that empty lines are truly empty, they should not contain any whitespace characters. diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java index f595891a8..16e101de8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java @@ -360,7 +360,7 @@ public abstract class Reactor extends AbstractEnergyProvider { inv.replaceExistingItem(22, new CustomItem(Material.BLACK_STAINED_GLASS_PANE, " ")); if (processing.get(l).getOutput() != null) { - inv.pushItem(processing.get(l).getOutput(), getOutputSlots()); + inv.pushItem(processing.get(l).getOutput().clone(), getOutputSlots()); } if (accessPort != null) {