diff --git a/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java index c867a25..ca1968a 100644 --- a/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java +++ b/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java @@ -169,7 +169,7 @@ this.connectionType = type; FMLLog.fine("[%s] Server side %s connection established", Thread.currentThread().getName(), this.connectionType.name().toLowerCase(Locale.ENGLISH)); this.state = ConnectionState.CONNECTED; - FMLCommonHandler.instance().bus().post(new FMLNetworkEvent.ServerConnectionFromClientEvent(manager)); +// FMLCommonHandler.instance().bus().post(new FMLNetworkEvent.ServerConnectionFromClientEvent(manager)); scm.initializeConnectionToPlayer(manager, player, serverHandler); } @Override diff --git a/src/main/java/org/ultramine/server/data/ServerDataLoader.java b/src/main/java/org/ultramine/server/data/ServerDataLoader.java index 1d33af5..ec1d634 100644 --- a/src/main/java/org/ultramine/server/data/ServerDataLoader.java +++ b/src/main/java/org/ultramine/server/data/ServerDataLoader.java @@ -20,6 +20,7 @@ import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.FMLNetworkEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.command.CommandHandler; @@ -162,6 +163,7 @@ { if(isClient) { + FMLCommonHandler.instance().bus().post(new FMLNetworkEvent.ServerConnectionFromClientEvent(network)); NBTTagCompound nbt = mgr.readPlayerDataFromFile(player); player.setData(getDataProvider().loadPlayerData(player.getGameProfile())); StatisticsFile existsStats = mgr.func_152602_a(player); @@ -197,6 +199,7 @@ @Override public Void apply(LoadedDataStruct data) //sync { + FMLCommonHandler.instance().bus().post(new FMLNetworkEvent.ServerConnectionFromClientEvent(network)); if(data.getNBT() != null) player.readFromNBT(data.getNBT()); playerLoadCallback(network, player, nethandler, data.getNBT(), data.getPlayerData(), data.getStats());