Fixed sellbuffs not working.

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

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -396,33 +390,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;

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 + "!");
{ holder.setPrice(price);
player.sendMessage("Price of " + player.getKnownSkill(holder.getSkillId()).getName() + " has been changed to " + price + "!"); SellBuffsManager.getInstance().sendBuffEditMenu(player);
holder.setPrice(price);
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!");
{ SellBuffsManager.getInstance().sendBuffEditMenu(player);
player.sendMessage("Skill " + player.getKnownSkill(holder.getSkillId()).getName() + " has been removed!");
SellBuffsManager.getInstance().sendBuffEditMenu(player);
break;
}
} }
} }
break; break;
@@ -405,33 +399,29 @@ 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()) 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()); player.sendMessage("Not enough " + item.getName() + "!");
AbstractScript.giveItems(seller, Config.SELLBUFF_PAYMENT_ID, holder.getPrice());
seller.reduceCurrentMp(skillToBuy.getMpConsume() * Config.SELLBUFF_MP_MULTIPLER);
skillToBuy.activateSkill(seller, player);
} }
else else
{ {
final Item item = ItemTable.getInstance().getTemplate(Config.SELLBUFF_PAYMENT_ID); player.sendMessage("Not enough items!");
if (item != null)
{
player.sendMessage("Not enough " + item.getName() + "!");
}
else
{
player.sendMessage("Not enough items!");
}
} }
break;
} }
} }
SellBuffsManager.getInstance().sendBuffMenu(player, seller, index); SellBuffsManager.getInstance().sendBuffMenu(player, seller, index);
} }
break; break;