Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
pahimar 2015-02-07 23:13:25 -05:00
parent e8e18fede1 dce8ea6af3
commit 44f06224cc
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/pahimar/ee3/handler/PlayerEventHandler.java
View file

@ -34,8 +34,9 @@ public class PlayerEventHandler
}
@SubscribeEvent
public void syncEnergyValuesOnLogin(cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent event)
public void onPlayerLoggedIn(cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent event)
{
TransmutationKnowledgeRegistry.getInstance().loadPlayerFromDiskIfNeeded(event.player);
PacketHandler.INSTANCE.sendTo(new MessageSyncEnergyValues(EnergyValueRegistry.getInstance()), (EntityPlayerMP) event.player);
}

2
src/main/java/com/pahimar/ee3/knowledge/TransmutationKnowledge.java
View file

@ -21,7 +21,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
private static final Gson jsonSerializer = (new GsonBuilder()).setPrettyPrinting().registerTypeAdapter(TransmutationKnowledge.class, new TransmutationKnowledge()).create();
private boolean canTransmuteEverything;
private Set<ItemStack> knownTransmutations;
private boolean hasBeenModified;
private boolean hasBeenModified = false;
public TransmutationKnowledge()
{

3
src/main/java/com/pahimar/ee3/knowledge/TransmutationKnowledgeRegistry.java
View file

@ -274,12 +274,13 @@ public class TransmutationKnowledgeRegistry
{
if (entityPlayer != null && entityPlayer.getUniqueID() != null)
{
if (playerKnowledgeMap.containsKey(entityPlayer.getUniqueID()) && playerKnowledgeMap.get(entityPlayer.getUniqueID()).hasBeenModified())
if (playerKnowledgeMap.containsKey(entityPlayer.getUniqueID()) && playerKnowledgeMap.get(entityPlayer.getUniqueID()) != null && playerKnowledgeMap.get(entityPlayer.getUniqueID()).hasBeenModified())
{
SerializationHelper.writeTransmutationKnowledgeToFile(playerKnowledgeDirectory, entityPlayer.getUniqueID().toString() + ".json", playerKnowledgeMap.get(entityPlayer.getUniqueID()));
}
else
{
loadPlayerFromDiskIfNeeded(entityPlayer);
SerializationHelper.writeTransmutationKnowledgeToFile(playerKnowledgeDirectory, entityPlayer.getUniqueID().toString() + ".json", new TransmutationKnowledge());
}
}