Prevent registering recipes if crafting is disabled.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2019-10-06 16:59:30 +00:00
parent 2f53082a4f
commit 6de3207b0e
16 changed files with 120 additions and 12 deletions

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Playable;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Playable;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Playable;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Playable;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Playable;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package org.l2jmobius.gameserver.handler.itemhandlers; package org.l2jmobius.gameserver.handler.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.datatables.csv.RecipeTable; import org.l2jmobius.gameserver.datatables.csv.RecipeTable;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -46,12 +47,18 @@ public class Recipes implements IItemHandler
{ {
return; return;
} }
PlayerInstance player = (PlayerInstance) playable;
RecipeList rp = RecipeTable.getInstance().getRecipeByItemId(item.getItemId()); final PlayerInstance player = (PlayerInstance) playable;
if (!Config.IS_CRAFTING_ENABLED)
{
player.sendMessage("Crafting is disabled, you cannot register this recipe.");
return;
}
final RecipeList rp = RecipeTable.getInstance().getRecipeByItemId(item.getItemId());
if (player.hasRecipeList(rp.getId())) if (player.hasRecipeList(rp.getId()))
{ {
SystemMessage sm = new SystemMessage(SystemMessageId.RECIPE_ALREADY_REGISTERED); player.sendPacket(new SystemMessage(SystemMessageId.RECIPE_ALREADY_REGISTERED));
player.sendPacket(sm);
} }
else if (rp.isDwarvenRecipe()) else if (rp.isDwarvenRecipe())
{ {
@ -60,8 +67,7 @@ public class Recipes implements IItemHandler
if (rp.getLevel() > player.getDwarvenCraft()) if (rp.getLevel() > player.getDwarvenCraft())
{ {
// can't add recipe, becouse create item level too low // can't add recipe, becouse create item level too low
SystemMessage sm = new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER); player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER));
player.sendPacket(sm);
} }
else if (player.getDwarvenRecipeBook().length >= player.GetDwarfRecipeLimit()) else if (player.getDwarvenRecipeBook().length >= player.GetDwarfRecipeLimit())
{ {
@ -81,8 +87,7 @@ public class Recipes implements IItemHandler
} }
else else
{ {
SystemMessage sm = new SystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT); player.sendPacket(new SystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT));
player.sendPacket(sm);
} }
} }
else if (player.hasCommonCraft()) else if (player.hasCommonCraft())
@ -90,8 +95,7 @@ public class Recipes implements IItemHandler
if (rp.getLevel() > player.getCommonCraft()) if (rp.getLevel() > player.getCommonCraft())
{ {
// can't add recipe, becouse create item level too low // can't add recipe, becouse create item level too low
SystemMessage sm = new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER); player.sendPacket(new SystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER));
player.sendPacket(sm);
} }
else if (player.getCommonRecipeBook().length >= player.GetCommonRecipeLimit()) else if (player.getCommonRecipeBook().length >= player.GetCommonRecipeLimit())
{ {
@ -111,8 +115,7 @@ public class Recipes implements IItemHandler
} }
else else
{ {
SystemMessage sm = new SystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT); player.sendPacket(new SystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT));
player.sendPacket(sm);
} }
} }

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {

View File

@ -16,6 +16,7 @@
*/ */
package handlers.itemhandlers; package handlers.itemhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.impl.RecipeData; import org.l2jmobius.gameserver.data.xml.impl.RecipeData;
import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.IItemHandler;
import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.RecipeList;
@ -39,6 +40,12 @@ public class Recipes implements IItemHandler
return false; return false;
} }
if (!Config.IS_CRAFTING_ENABLED)
{
playable.sendMessage("Crafting is disabled, you cannot register this recipe.");
return false;
}
final PlayerInstance player = playable.getActingPlayer(); final PlayerInstance player = playable.getActingPlayer();
if (player.isCrafting()) if (player.isCrafting())
{ {