lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed sellbuffs not working.

Browse Source 
Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2020-08-03 05:00:25 +00:00
parent 1332da66e0
commit 4d9f34b5ba
17 changed files with 391 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -213,15 +213,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -248,14 +245,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -396,9 +390,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -419,10 +412,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

22
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java vendored
View File

@@ -216,15 +216,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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 + "!"); player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!");
holder.setPrice(price); holder.setPrice(price);
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -253,14 +250,11 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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!"); player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player); SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,9 +399,8 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false; 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())
{ {
@@ -428,10 +421,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
player.sendMessage("Not enough items!"); player.sendMessage("Not enough items!");
} }
} }
break;
} }
}
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;