Skip to content

Commit 0513e18

Browse files
authored
Merge pull request #41 from TBoshoven/1.15-fix-dedicated-server-crash
Only register block color handlers on clients
2 parents 03effb8 + a26341f commit 0513e18

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/MagicDoorknobMod.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ public final class MagicDoorknobMod {
2323

2424
public MagicDoorknobMod() {
2525
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
26-
BlockColorHandlers.register(modEventBus);
2726
Blocks.register(modEventBus);
2827
DataGenerators.register(modEventBus);
2928
Items.register(modEventBus);
3029
TileEntities.register(modEventBus);
3130

32-
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> ModelLoaders.register(modEventBus));
31+
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
32+
BlockColorHandlers.register(modEventBus);
33+
ModelLoaders.register(modEventBus);
34+
});
3335
}
3436
}

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/colorhandlers/BlockColorHandlers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
@ParametersAreNonnullByDefault
1818
@MethodsReturnNonnullByDefault
19+
@OnlyIn(Dist.CLIENT)
1920
public final class BlockColorHandlers {
2021
private BlockColorHandlers() {
2122
}
@@ -27,7 +28,6 @@ public static void register(IEventBus eventBus) {
2728
/**
2829
* Register all color handlers.
2930
*/
30-
@OnlyIn(Dist.CLIENT)
3131
private static void registerBlockColorHandlers(ColorHandlerEvent.Block event) {
3232
BlockColors blockColors = event.getBlockColors();
3333

0 commit comments

Comments
 (0)