Skip to content

Commit b180f9a

Browse files
committed
Thoroughly controlled
- Fix crash when placing empty linked controllers in lecterns Creators-of-Create#7876
1 parent d0b0970 commit b180f9a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
99
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
1010

11+
import net.minecraftforge.api.distmarker.Dist;
12+
import net.minecraftforge.api.distmarker.OnlyIn;
13+
import net.minecraftforge.common.ForgeMod;
14+
import net.minecraftforge.fml.DistExecutor;
15+
1116
import net.minecraft.client.Minecraft;
1217
import net.minecraft.core.BlockPos;
1318
import net.minecraft.core.Direction;
@@ -23,11 +28,6 @@
2328
import net.minecraft.world.level.block.state.BlockState;
2429
import net.minecraft.world.phys.Vec3;
2530

26-
import net.minecraftforge.api.distmarker.Dist;
27-
import net.minecraftforge.api.distmarker.OnlyIn;
28-
import net.minecraftforge.common.ForgeMod;
29-
import net.minecraftforge.fml.DistExecutor;
30-
3131
public class LecternControllerBlockEntity extends SmartBlockEntity {
3232

3333
private CompoundTag controllerNbt = new CompoundTag();
@@ -150,7 +150,7 @@ private void tryToggleActive() {
150150

151151
public void setController(ItemStack newController) {
152152
if (newController != null) {
153-
controllerNbt = newController.getTag();
153+
controllerNbt = newController.getOrCreateTag();
154154
AllSoundEvents.CONTROLLER_PUT.playOnServer(level, worldPosition);
155155
}
156156
}
@@ -189,7 +189,7 @@ public static boolean playerInRange(Player player, Level world, BlockPos pos) {
189189

190190
private ItemStack createLinkedController() {
191191
ItemStack stack = AllItems.LINKED_CONTROLLER.asStack();
192-
stack.setTag(controllerNbt);
192+
stack.setTag(controllerNbt.copy());
193193
return stack;
194194
}
195195

0 commit comments

Comments
 (0)