From 15e3d5b761a37fdfadfe56748545edb1029dbfd1 Mon Sep 17 00:00:00 2001 From: Azanor Date: Fri, 16 May 2014 08:48:53 +0200 Subject: [PATCH] fix for baubles getting duped between worlds - properly clear player baubles inventory before he enters the world and reset file pointers - only attempt to load or save baubles server-side --- build.gradle | 2 +- src/main/java/baubles/common/Baubles.java | 2 +- .../common/container/InventoryBaubles.java | 1 + .../baubles/common/lib/PlayerHandler.java | 243 +++++++++--------- .../common/network/EventHandlerNetwork.java | 1 + src/main/resources/changelog.txt | 4 + 6 files changed, 129 insertions(+), 124 deletions(-) diff --git a/build.gradle b/build.gradle index dc1e0d5..d908f74 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.2-1.0.0.12" +version = "1.7.2-1.0.0.13" group= "com.azanor.baubles" archivesBaseName = "Baubles" diff --git a/src/main/java/baubles/common/Baubles.java b/src/main/java/baubles/common/Baubles.java index 8e86c60..cb8916d 100644 --- a/src/main/java/baubles/common/Baubles.java +++ b/src/main/java/baubles/common/Baubles.java @@ -26,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.0.12"; + public static final String VERSION = "1.0.0.13"; @SidedProxy(clientSide = "baubles.client.ClientProxy", serverSide = "baubles.common.CommonProxy") public static CommonProxy proxy; diff --git a/src/main/java/baubles/common/container/InventoryBaubles.java b/src/main/java/baubles/common/container/InventoryBaubles.java index a42d2e2..3d6e9e5 100644 --- a/src/main/java/baubles/common/container/InventoryBaubles.java +++ b/src/main/java/baubles/common/container/InventoryBaubles.java @@ -148,6 +148,7 @@ public class InventoryBaubles implements IInventory { */ @Override public void markDirty() { + try { PlayerHandler.savePlayerBaubles(player.get()); } catch (Exception e) { } diff --git a/src/main/java/baubles/common/lib/PlayerHandler.java b/src/main/java/baubles/common/lib/PlayerHandler.java index 6e3bf0a..7a9d503 100644 --- a/src/main/java/baubles/common/lib/PlayerHandler.java +++ b/src/main/java/baubles/common/lib/PlayerHandler.java @@ -12,10 +12,13 @@ import baubles.common.Baubles; import baubles.common.container.InventoryBaubles; public class PlayerHandler { - private static File playersDirectory; private static HashMap playerBaubles = new HashMap(); + public static void clearPlayerBaubles(EntityPlayer player) { + playerBaubles.remove(player.getCommandSenderName()); + } + public static InventoryBaubles getPlayerBaubles(EntityPlayer player) { if (!playerBaubles.containsKey(player.getCommandSenderName())) { InventoryBaubles inventory = new InventoryBaubles(player); @@ -28,140 +31,136 @@ public class PlayerHandler { playerBaubles.put(player.getCommandSenderName(), inventory); } -// public static void updatePlayerBaubles(EntityPlayer player) { -// InventoryBaubles inventory = getPlayerBaubles(player); -// inventory.saveNBT(player); -// } - public static File getFileFromPlayer(EntityPlayer player) { - if (playersDirectory == null) { - try { - playersDirectory = new File(player.worldObj.getSaveHandler().getWorldDirectory(), "players"); - } catch (Exception e) { e.printStackTrace(); } - } - return new File(playersDirectory, player.getCommandSenderName() + ".baub"); + try { + File playersDirectory = new File(player.worldObj.getSaveHandler().getWorldDirectory(), "players"); + return new File(playersDirectory, player.getCommandSenderName() + ".baub"); + } catch (Exception e) { e.printStackTrace(); } + return null; } public static File getBackupFileFromPlayer(EntityPlayer player) { - if (playersDirectory == null) { - try { - playersDirectory = new File(player.worldObj.getSaveHandler().getWorldDirectory(), "players"); - } catch (Exception e) { e.printStackTrace(); } - } - return new File(playersDirectory, player.getCommandSenderName() + ".baubback"); + try { + File playersDirectory = new File(player.worldObj.getSaveHandler().getWorldDirectory(), "players"); + return new File(playersDirectory, player.getCommandSenderName() + ".baubback"); + } catch (Exception e) { e.printStackTrace(); } + return null; } public static void loadPlayerBaubles(EntityPlayer player) { - try - { - NBTTagCompound data = null; - boolean save = false; - File file = getFileFromPlayer(player); - if (file != null && file.exists()) - { - try { - FileInputStream fileinputstream = new FileInputStream(file); - data = CompressedStreamTools.readCompressed(fileinputstream); - fileinputstream.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - if (file == null || !file.exists() || data == null || data.hasNoTags()) - { - Baubles.log.warn("Data not found for "+player.getCommandSenderName()+". Trying to load backup data."); - file = getBackupFileFromPlayer(player); - if (file != null && file.exists()) - { - try { - FileInputStream fileinputstream = new FileInputStream(file); - data = CompressedStreamTools.readCompressed(fileinputstream); - fileinputstream.close(); - save = true; - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (file == null || !file.exists() || data == null || data.hasNoTags()) - { //legacy data - Baubles.log.warn("Data not found for "+player.getCommandSenderName()+". Trying to load legacy data."); - data = player.getEntityData(); - save = true; - } - - if (data!=null) { - InventoryBaubles inventory = new InventoryBaubles(player); - inventory.readNBT(data); - playerBaubles.put(player.getCommandSenderName(), inventory); - if (save) savePlayerBaubles(player); - } - } - catch (Exception exception1) - { - Baubles.log.fatal("Error loading baubles inventory"); - exception1.printStackTrace(); - } - + if (player!=null && !player.worldObj.isRemote) { + try + { + NBTTagCompound data = null; + boolean save = false; + File file = getFileFromPlayer(player); + if (file != null && file.exists()) + { + try { + FileInputStream fileinputstream = new FileInputStream(file); + data = CompressedStreamTools.readCompressed(fileinputstream); + fileinputstream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + if (file == null || !file.exists() || data == null || data.hasNoTags()) + { + Baubles.log.warn("Data not found for "+player.getCommandSenderName()+". Trying to load backup data."); + file = getBackupFileFromPlayer(player); + if (file != null && file.exists()) + { + try { + FileInputStream fileinputstream = new FileInputStream(file); + data = CompressedStreamTools.readCompressed(fileinputstream); + fileinputstream.close(); + save = true; + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (file == null || !file.exists() || data == null || data.hasNoTags()) + { //legacy data + Baubles.log.warn("Data not found for "+player.getCommandSenderName()+". Trying to load legacy data."); + data = player.getEntityData(); + save = true; + } + + if (data!=null) { + InventoryBaubles inventory = new InventoryBaubles(player); + inventory.readNBT(data); + playerBaubles.put(player.getCommandSenderName(), inventory); + if (save) savePlayerBaubles(player); + } + } + catch (Exception exception1) + { + Baubles.log.fatal("Error loading baubles inventory"); + exception1.printStackTrace(); + } + } } public static void savePlayerBaubles(EntityPlayer player) { - try - { - File file2 = getBackupFileFromPlayer(player); - if (file2 != null && file2.exists()) - { - try { - file2.delete(); - } - catch (Exception e) { - Baubles.log.error("Could not delete backup file for player "+player.getCommandSenderName()); - } - } - - File file1 = getFileFromPlayer(player); - file2 = getBackupFileFromPlayer(player); - if (file1!=null && file1.exists()) { - try { - file1.renameTo(file2); - } - catch (Exception e) { - Baubles.log.error("Could not backup old baubles file for player "+player.getCommandSenderName()); - } - } - - file1 = getFileFromPlayer(player); - try { - if (file1 != null ) - { - InventoryBaubles inventory = getPlayerBaubles(player); - NBTTagCompound data = new NBTTagCompound(); - inventory.saveNBT(data); - - FileOutputStream fileoutputstream = new FileOutputStream(file1); - CompressedStreamTools.writeCompressed(data, fileoutputstream); - fileoutputstream.close(); - - } - } catch (Exception e) { - Baubles.log.error("Could not save baubles file for player "+player.getCommandSenderName()); - if (file1.exists()) { - try { - file1.delete(); + if (player!=null && !player.worldObj.isRemote) { + try + { + File file2 = getBackupFileFromPlayer(player); + if (file2 != null && file2.exists()) + { + try { + file2.delete(); } - catch (Exception e2) {} + catch (Exception e) { + Baubles.log.error("Could not delete backup file for player "+player.getCommandSenderName()); + } + } + + File file1 = getFileFromPlayer(player); + file2 = getBackupFileFromPlayer(player); + if (file1!=null && file1.exists()) { + try { + file1.renameTo(file2); + } + catch (Exception e) { + Baubles.log.error("Could not backup old baubles file for player "+player.getCommandSenderName()); + } + } + + file1 = getFileFromPlayer(player); + try { + if (file1 != null ) + { + InventoryBaubles inventory = getPlayerBaubles(player); + NBTTagCompound data = new NBTTagCompound(); + inventory.saveNBT(data); + + FileOutputStream fileoutputstream = new FileOutputStream(file1); + CompressedStreamTools.writeCompressed(data, fileoutputstream); + fileoutputstream.close(); + + } + } catch (Exception e) { + Baubles.log.error("Could not save baubles file for player "+player.getCommandSenderName()); + e.printStackTrace(); + if (file1.exists()) { + try { + file1.delete(); + } + catch (Exception e2) {} + } } - } - } - catch (Exception exception1) - { - Baubles.log.fatal("Error saving baubles inventory"); - exception1.printStackTrace(); - } - + } + catch (Exception exception1) + { + Baubles.log.fatal("Error saving baubles inventory"); + exception1.printStackTrace(); + } + } } } diff --git a/src/main/java/baubles/common/network/EventHandlerNetwork.java b/src/main/java/baubles/common/network/EventHandlerNetwork.java index b9682dc..c8b0b98 100644 --- a/src/main/java/baubles/common/network/EventHandlerNetwork.java +++ b/src/main/java/baubles/common/network/EventHandlerNetwork.java @@ -12,6 +12,7 @@ public class EventHandlerNetwork { public void playerLoggedInEvent (PlayerEvent.PlayerLoggedInEvent event) { Side side = FMLCommonHandler.instance().getEffectiveSide(); if (side == Side.SERVER) { + PlayerHandler.clearPlayerBaubles(event.player); PlayerHandler.loadPlayerBaubles(event.player); for (int a=0;a<4;a++) PlayerHandler.getPlayerBaubles(event.player).syncSlotToClients(a); diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index 7d78412..59aff10 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -1,3 +1,7 @@ +1.0.0.13 +- properly clear player baubles inventory before he enters the world and reset file pointers +- only attempt to load or save baubles server-side + 1.0.0.12 - fix for baubles being synced to the wrong player on the client