Save and delete recipes in real time.

Thanks to ReynalDev.

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java

@@ -55,30 +55,30 @@ public class Recipes implements IItemHandler
 			return;
 		}
 		
-		final RecipeList rp = RecipeTable.getInstance().getRecipeByItemId(item.getItemId());
+		final RecipeList recipe = RecipeTable.getInstance().getRecipeByItemId(item.getItemId());
-		if (player.hasRecipeList(rp.getId()))
+		if (player.hasRecipeList(recipe.getId()))
 		{
 			player.sendPacket(new SystemMessage(SystemMessageId.RECIPE_ALREADY_REGISTERED));
 		}
-		else if (rp.isDwarvenRecipe())
+		else if (recipe.isDwarvenRecipe())
 		{
 			if (player.hasDwarvenCraft())
 			{
-				if (rp.getLevel() > player.getDwarvenCraft())
+				if (recipe.getLevel() > player.getDwarvenCraft())
 				{
 					// can't add recipe, becouse create item level too low
 					player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER));
 				}
 				else if (player.getDwarvenRecipeBook().length >= player.GetDwarfRecipeLimit())
 				{
-					// Up to $s1 recipes can be registered.
 					final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER);
 					sm.addNumber(player.GetDwarfRecipeLimit());
 					player.sendPacket(sm);
 				}
 				else
 				{
-					player.registerDwarvenRecipeList(rp);
+					player.registerDwarvenRecipeList(recipe);
+					player.saveRecipeIntoDB(recipe);
 					player.destroyItem("Consume", item.getObjectId(), 1, null, false);
 					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ADDED);
 					sm.addString(item.getItemName());
@@ -92,21 +92,21 @@ public class Recipes implements IItemHandler
 		}
 		else if (player.hasCommonCraft())
 		{
-			if (rp.getLevel() > player.getCommonCraft())
+			if (recipe.getLevel() > player.getCommonCraft())
 			{
 				// can't add recipe, becouse create item level too low
 				player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER));
 			}
 			else if (player.getCommonRecipeBook().length >= player.GetCommonRecipeLimit())
 			{
-				// Up to $s1 recipes can be registered.
 				final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER);
 				sm.addNumber(player.GetCommonRecipeLimit());
 				player.sendPacket(sm);
 			}
 			else
 			{
-				player.registerCommonRecipeList(rp);
+				player.registerCommonRecipeList(recipe);
+				player.saveRecipeIntoDB(recipe);
 				player.destroyItem("Consume", item.getObjectId(), 1, null, false);
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_ADDED);
 				sm.addString(item.getItemName());

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -254,6 +254,8 @@ public class PlayerInstance extends Playable
 	private static final String RESTORE_CHAR_RECOMS = "SELECT char_id,target_id FROM character_recommends WHERE char_id=?";
 	private static final String ADD_CHAR_RECOM = "INSERT INTO character_recommends (char_id,target_id) VALUES (?,?)";
 	private static final String DELETE_CHAR_RECOMS = "DELETE FROM character_recommends WHERE char_id=?";
+	private static final String INSERT_CHARACTER_RECIPEBOOK = "INSERT INTO character_recipebook (char_id, id, type) VALUES(?,?,?)";
+	private static final String DELETE_CHARARACTER_RECIPEBOOK = "DELETE FROM character_recipebook WHERE char_id=? AND id=?";
 	private static final String RESTORE_SKILLS_FOR_CHAR = "SELECT skill_id,skill_level FROM character_skills WHERE char_obj_id=? AND class_index=?";
 	private static final String ADD_NEW_SKILL = "INSERT INTO character_skills (char_obj_id,skill_id,skill_level,skill_name,class_index) VALUES (?,?,?,?,?)";
 	private static final String UPDATE_CHARACTER_SKILL_LEVEL = "UPDATE character_skills SET skill_level=? WHERE skill_id=? AND char_obj_id=? AND class_index=?";
@@ -1506,9 +1508,19 @@ public class PlayerInstance extends Playable
 			LOGGER.warning("Attempted to remove unknown RecipeList: " + recipeId);
 		}
 		
-		final ShortCut[] allShortCuts = getAllShortCuts();
+		try (Connection con = DatabaseFactory.getConnection();
+			PreparedStatement deleteRecipe = con.prepareStatement(DELETE_CHARARACTER_RECIPEBOOK))
+		{
+			deleteRecipe.setInt(1, getObjectId());
+			deleteRecipe.setInt(2, recipeId); // 0 = Normal recipe, 1 Dwarven recipe
+			deleteRecipe.executeUpdate();
+		}
+		catch (Exception e)
+		{
+			LOGGER.warning("PlayerInstance.unregisterRecipeList : Could not delete recipe book data " + e);
+		}
 		
-		for (ShortCut sc : allShortCuts)
+		for (ShortCut sc : getAllShortCuts())
 		{
 			if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortCut.TYPE_RECIPE))
 			{
@@ -9128,53 +9140,19 @@ public class PlayerInstance extends Playable
 		}
 	}
 	
-	/**
+	public void saveRecipeIntoDB(RecipeList recipe)
-	 * Store recipe book data for this PlayerInstance, if not on an active sub-class.
-	 */
-	private synchronized void storeRecipeBook()
 	{
-		// If the player is on a sub-class don't even attempt to store a recipe book.
+		try (Connection con = DatabaseFactory.getConnection();
-		if (isSubClassActive())
+			PreparedStatement insertRecipe = con.prepareStatement(INSERT_CHARACTER_RECIPEBOOK))
 		{
-			return;
+			insertRecipe.setInt(1, getObjectId());
-		}
+			insertRecipe.setInt(2, recipe.getId());
-		
+			insertRecipe.setBoolean(3, recipe.isDwarvenRecipe()); // 0 = Normal recipe, 1 Dwarven recipe
-		if ((getCommonRecipeBook().length == 0) && (getDwarvenRecipeBook().length == 0))
+			insertRecipe.executeUpdate();
-		{
-			return;
-		}
-		
-		try (Connection con = DatabaseFactory.getConnection())
-		{
-			PreparedStatement statement = con.prepareStatement("DELETE FROM character_recipebook WHERE char_id=?");
-			statement.setInt(1, getObjectId());
-			statement.execute();
-			statement.close();
-			
-			RecipeList[] recipes = getCommonRecipeBook();
-			
-			for (RecipeList recipe : recipes)
-			{
-				statement = con.prepareStatement("INSERT INTO character_recipebook (char_id, id, type) values(?,?,0)");
-				statement.setInt(1, getObjectId());
-				statement.setInt(2, recipe.getId());
-				statement.execute();
-				statement.close();
-			}
-			
-			recipes = getDwarvenRecipeBook();
-			for (RecipeList recipe : recipes)
-			{
-				statement = con.prepareStatement("INSERT INTO character_recipebook (char_id, id, type) values(?,?,1)");
-				statement.setInt(1, getObjectId());
-				statement.setInt(2, recipe.getId());
-				statement.execute();
-				statement.close();
-			}
 		}
 		catch (Exception e)
 		{
-			LOGGER.warning("Could not store recipe book data: " + e);
+			LOGGER.warning("PlayerInstance.saveRecipeIntoDB : Could not store recipe book data " + e);
 		}
 	}
 	
@@ -9301,8 +9279,6 @@ public class PlayerInstance extends Playable
 			storeEffect();
 		}
 		
-		storeRecipeBook();
-		
 		final PlayerVariables vars = getScript(PlayerVariables.class);
 		if (vars != null)
 		{