From 3f0e3e725ee7ef33dcd9fae2764016ad79f374d8 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 21 Apr 2017 13:30:51 +0200 Subject: [PATCH] Fix NPE when receiving Replay|Restrict messages (fixes #16 GH) --- .../java/com/replaymod/recording/ReplayModRecording.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/replaymod/recording/ReplayModRecording.java b/src/main/java/com/replaymod/recording/ReplayModRecording.java index 7e38ebe8..9d1cd988 100644 --- a/src/main/java/com/replaymod/recording/ReplayModRecording.java +++ b/src/main/java/com/replaymod/recording/ReplayModRecording.java @@ -4,8 +4,10 @@ import com.replaymod.core.ReplayMod; import com.replaymod.core.utils.Restrictions; import com.replaymod.recording.handler.ConnectionEventHandler; import com.replaymod.recording.packet.PacketListener; -import net.minecraftforge.fml.common.FMLCommonHandler; +import io.netty.channel.ChannelDuplexHandler; +import io.netty.channel.ChannelHandler; import net.minecraft.network.NetworkManager; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -54,7 +56,9 @@ public class ReplayModRecording { EventBus bus = FMLCommonHandler.instance().bus(); bus.register(connectionEventHandler = new ConnectionEventHandler(logger, core)); - NetworkRegistry.INSTANCE.newSimpleChannel(Restrictions.PLUGIN_CHANNEL); + @ChannelHandler.Sharable + class RestrictionsChannelHandler extends ChannelDuplexHandler {} + NetworkRegistry.INSTANCE.newChannel(Restrictions.PLUGIN_CHANNEL, new RestrictionsChannelHandler()); } public void initiateRecording(NetworkManager networkManager) {