From 4d9f34b5ba037a620512698d33ca786883b12281 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 3 Aug 2020 05:00:25 +0000
Subject: [PATCH] Fixed sellbuffs not working. Contributed by CostyKiller.

---
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 .../scripts/custom/SellBuff/SellBuff.java     | 56 ++++++++-----------
 17 files changed, 391 insertions(+), 561 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index 8bf93bbaf5..449180437e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -213,15 +213,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -248,14 +245,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -396,33 +390,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index c458f1aab6..06cba57757 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToChange.getId())).findFirst().orElse(null);
+					if ((holder != null))
 					{
-						if (holder.getSkillId() == skillToChange.getId())
-						{
-							player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
-							holder.setPrice(price);
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
+						holder.setPrice(price);
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = player.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToRemove.getId())).findFirst().orElse(null);
+					if ((holder != null) && player.getSellingBuffs().remove(holder))
 					{
-						if ((holder.getSkillId() == skillToRemove.getId()) && player.getSellingBuffs().remove(holder))
-						{
-							player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
-							SellBuffsManager.getInstance().sendBuffEditMenu(player);
-							break;
-						}
+						player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
+						SellBuffsManager.getInstance().sendBuffEditMenu(player);
 					}
 				}
 				break;
@@ -405,33 +399,29 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
 						return false;
 					}
 					
-					for (SellBuffHolder holder : player.getSellingBuffs())
+					final SellBuffHolder holder = seller.getSellingBuffs().stream().filter(h -> (h.getSkillId() == skillToBuy.getId())).findFirst().orElse(null);
+					if (holder != null)
 					{
-						if (holder.getSkillId() == skillToBuy.getId())
+						if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
 						{
-							if (AbstractScript.getQuestItemsCount(player, Config.SELLBUFF_PAYMENT_ID) >= holder.getPrice())
+							AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
+							seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
+							skillToBuy.activateSkill(seller, player);
+						}
+						else
+						{
+							final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
+							if (item != null)
 							{
-								AbstractScript.takeItems(player, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
-								seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
-								skillToBuy.activateSkill(seller, player);
+								player.sendMessage("Not enough " + item.getName() + "!");
 							}
 							else
 							{
-								final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID);
-								if (item != null)
-								{
-									player.sendMessage("Not enough " + item.getName() + "!");
-								}
-								else
-								{
-									player.sendMessage("Not enough items!");
-								}
+								player.sendMessage("Not enough items!");
 							}
-							break;
 						}
 					}
-					
 					SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
 				}
 				break;