Fix for desync between client and server
This commit is contained in:
Azanor committed 2014-08-25 11:35:36 +02:00
1 parent 45e6e3fe27
commit f00345f30b
5 files changed
+39 -7

No files matched your search

+6 -1
View File
@@ -8,7 +8,9 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import baubles.common.event.EventHandlerEntity;
import baubles.common.event.EventHandlerNetwork;
import baubles.common.network.PacketHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
@@ -24,7 +26,7 @@ public class Baubles {
public static final String MODID = "Baubles";
public static final String MODNAME = "Baubles";
public static final String VERSION = "1.0.1.5";
public static final String VERSION = "1.0.1.6";
@SidedProxy(clientSide = "baubles.client.ClientProxy", serverSide = "baubles.common.CommonProxy")
public static CommonProxy proxy;
@@ -33,6 +35,7 @@ public class Baubles {
public static Baubles instance;
public EventHandlerEntity entityEventHandler;
public EventHandlerNetwork entityEventNetwork;
public File modDir;
public static final Logger log = LogManager.getLogger("Baubles");
@@ -54,8 +57,10 @@ public class Baubles {
PacketHandler.init();
entityEventHandler = new EventHandlerEntity();
entityEventNetwork = new EventHandlerNetwork();
MinecraftForge.EVENT_BUS.register(entityEventHandler);
FMLCommonHandler.instance().bus().register(entityEventNetwork);
proxy.registerHandlers();
/////////////////////
@@ -65,13 +65,10 @@ public class EventHandlerEntity {
}
PlayerHandler.loadPlayerBaubles(event.entityPlayer, file1, event.getPlayerFile("baubback"));
for (int a = 0; a < 4; a++)
PlayerHandler.getPlayerBaubles(event.entityPlayer)
.syncSlotToClients(a);
EventHandlerNetwork.syncBaubles(event.entityPlayer);
}
public static File getLegacyFileFromPlayer(EntityPlayer player)
{
try {
@@ -0,0 +1,27 @@
package baubles.common.event;
import net.minecraft.entity.player.EntityPlayer;
import baubles.common.lib.PlayerHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import cpw.mods.fml.relauncher.Side;
public class EventHandlerNetwork {
@SubscribeEvent
public void playerLoggedInEvent (PlayerEvent.PlayerLoggedInEvent event) {
Side side = FMLCommonHandler.instance().getEffectiveSide();
if (side == Side.SERVER) {
syncBaubles(event.player);
}
}
public static void syncBaubles(EntityPlayer player) {
for (int a = 0; a < 4; a++) {
PlayerHandler.getPlayerBaubles(player).syncSlotToClients(a);
}
}
}