RecipeController class is an instance manager.
This commit is contained in:
MobiusDevelopment
parent
6de03faace
commit
e1a85ab007
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -760,13 +760,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -51,7 +51,6 @@ import org.l2jmobius.commons.util.Chronos;
|
|||||||
import org.l2jmobius.commons.util.CommonUtil;
|
import org.l2jmobius.commons.util.CommonUtil;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -122,6 +121,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10909,7 +10909,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -760,13 +760,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -51,7 +51,6 @@ import org.l2jmobius.commons.util.Chronos;
|
|||||||
import org.l2jmobius.commons.util.CommonUtil;
|
import org.l2jmobius.commons.util.CommonUtil;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -123,6 +122,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10916,7 +10916,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -760,13 +760,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -51,7 +51,6 @@ import org.l2jmobius.commons.util.Chronos;
|
|||||||
import org.l2jmobius.commons.util.CommonUtil;
|
import org.l2jmobius.commons.util.CommonUtil;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -124,6 +123,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10918,7 +10918,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -99,6 +99,7 @@ import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager;
|
import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
|
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
|
import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.events.EventManager;
|
import org.l2jmobius.gameserver.instancemanager.events.EventManager;
|
||||||
@ -294,7 +295,7 @@ public class GameServer
|
|||||||
|
|
||||||
Util.printSection("Misc");
|
Util.printSection("Misc");
|
||||||
RecipeData.getInstance();
|
RecipeData.getInstance();
|
||||||
RecipeController.getInstance();
|
RecipeManager.getInstance();
|
||||||
EventDroplist.getInstance();
|
EventDroplist.getInstance();
|
||||||
MonsterRace.getInstance();
|
MonsterRace.getInstance();
|
||||||
Lottery.getInstance();
|
Lottery.getInstance();
|
||||||
|
|||||||
@ -29,11 +29,11 @@ import org.w3c.dom.NamedNodeMap;
|
|||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
|
|
||||||
import org.l2jmobius.commons.util.IXmlReader;
|
import org.l2jmobius.commons.util.IXmlReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.RecipeList;
|
import org.l2jmobius.gameserver.model.RecipeList;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.RecipeInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.RecipeInstance;
|
||||||
|
|
||||||
public class RecipeData extends RecipeController implements IXmlReader
|
public class RecipeData extends RecipeManager implements IXmlReader
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
|
private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
|
||||||
|
|
||||||
|
|||||||
@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.skillhandlers;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.handler.ISkillHandler;
|
import org.l2jmobius.gameserver.handler.ISkillHandler;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.Skill;
|
import org.l2jmobius.gameserver.model.Skill;
|
||||||
import org.l2jmobius.gameserver.model.Skill.SkillType;
|
import org.l2jmobius.gameserver.model.Skill.SkillType;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
@ -54,7 +54,7 @@ public class Craft implements ISkillHandler
|
|||||||
player.sendPacket(SystemMessageId.AN_ITEM_MAY_NOT_BE_CREATED_WHILE_ENGAGED_IN_TRADING);
|
player.sendPacket(SystemMessageId.AN_ITEM_MAY_NOT_BE_CREATED_WHILE_ENGAGED_IN_TRADING);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == SkillType.DWARVEN_CRAFT));
|
RecipeManager.getInstance().requestBookOpen(player, (skill.getSkillType() == SkillType.DWARVEN_CRAFT));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -49,18 +49,12 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Logger LOGGER = Logger.getLogger(RecipeController.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(RecipeManager.class.getName());
|
||||||
|
|
||||||
private static RecipeController INSTANCE;
|
|
||||||
protected static final Map<PlayerInstance, RecipeItemMaker> _activeMakers = Collections.synchronizedMap(new WeakHashMap<PlayerInstance, RecipeItemMaker>());
|
protected static final Map<PlayerInstance, RecipeItemMaker> _activeMakers = Collections.synchronizedMap(new WeakHashMap<PlayerInstance, RecipeItemMaker>());
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
|
||||||
{
|
|
||||||
return INSTANCE == null ? INSTANCE = new RecipeController() : INSTANCE;
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void requestBookOpen(PlayerInstance player, boolean isDwarvenCraft)
|
public synchronized void requestBookOpen(PlayerInstance player, boolean isDwarvenCraft)
|
||||||
{
|
{
|
||||||
RecipeItemMaker maker = null;
|
RecipeItemMaker maker = null;
|
||||||
@ -82,7 +76,7 @@ public class RecipeController
|
|||||||
|
|
||||||
public synchronized void requestMakeItemAbort(PlayerInstance player)
|
public synchronized void requestMakeItemAbort(PlayerInstance player)
|
||||||
{
|
{
|
||||||
_activeMakers.remove(player); // TODO: anything else here?
|
_activeMakers.remove(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized void requestManufactureItem(PlayerInstance manufacturer, int recipeListId, PlayerInstance player)
|
public synchronized void requestManufactureItem(PlayerInstance manufacturer, int recipeListId, PlayerInstance player)
|
||||||
@ -697,4 +691,14 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
return recipeList;
|
return recipeList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static RecipeManager getInstance()
|
||||||
|
{
|
||||||
|
return SingletonHolder.INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class SingletonHolder
|
||||||
|
{
|
||||||
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -40,7 +40,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import org.l2jmobius.gameserver.ai.PlayerAI;
|
import org.l2jmobius.gameserver.ai.PlayerAI;
|
||||||
@ -82,6 +81,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.RebirthManager;
|
import org.l2jmobius.gameserver.instancemanager.RebirthManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.events.CTF;
|
import org.l2jmobius.gameserver.instancemanager.events.CTF;
|
||||||
import org.l2jmobius.gameserver.instancemanager.events.DM;
|
import org.l2jmobius.gameserver.instancemanager.events.DM;
|
||||||
@ -13435,7 +13435,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Throwable t)
|
catch (Throwable t)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -47,6 +47,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -58,6 +58,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -79,7 +79,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
|
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -103,6 +103,7 @@ import org.l2jmobius.gameserver.instancemanager.PrecautionaryRestartManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager;
|
import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
|
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
|
import org.l2jmobius.gameserver.instancemanager.ServerRestartManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.events.EventManager;
|
import org.l2jmobius.gameserver.instancemanager.events.EventManager;
|
||||||
@ -299,7 +300,7 @@ public class GameServer
|
|||||||
|
|
||||||
Util.printSection("Misc");
|
Util.printSection("Misc");
|
||||||
RecipeData.getInstance();
|
RecipeData.getInstance();
|
||||||
RecipeController.getInstance();
|
RecipeManager.getInstance();
|
||||||
EventDroplist.getInstance();
|
EventDroplist.getInstance();
|
||||||
AugmentationData.getInstance();
|
AugmentationData.getInstance();
|
||||||
MonsterRace.getInstance();
|
MonsterRace.getInstance();
|
||||||
|
|||||||
@ -29,11 +29,11 @@ import org.w3c.dom.NamedNodeMap;
|
|||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
|
|
||||||
import org.l2jmobius.commons.util.IXmlReader;
|
import org.l2jmobius.commons.util.IXmlReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.RecipeList;
|
import org.l2jmobius.gameserver.model.RecipeList;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.RecipeInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.RecipeInstance;
|
||||||
|
|
||||||
public class RecipeData extends RecipeController implements IXmlReader
|
public class RecipeData extends RecipeManager implements IXmlReader
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
|
private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
|
||||||
|
|
||||||
|
|||||||
@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.skillhandlers;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.handler.ISkillHandler;
|
import org.l2jmobius.gameserver.handler.ISkillHandler;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.Skill;
|
import org.l2jmobius.gameserver.model.Skill;
|
||||||
import org.l2jmobius.gameserver.model.Skill.SkillType;
|
import org.l2jmobius.gameserver.model.Skill.SkillType;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
@ -54,7 +54,7 @@ public class Craft implements ISkillHandler
|
|||||||
player.sendPacket(SystemMessageId.AN_ITEM_MAY_NOT_BE_CREATED_WHILE_ENGAGED_IN_TRADING);
|
player.sendPacket(SystemMessageId.AN_ITEM_MAY_NOT_BE_CREATED_WHILE_ENGAGED_IN_TRADING);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
RecipeController.getInstance().requestBookOpen(player, (skill.getSkillType() == SkillType.DWARVEN_CRAFT));
|
RecipeManager.getInstance().requestBookOpen(player, (skill.getSkillType() == SkillType.DWARVEN_CRAFT));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@ -49,18 +49,12 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Logger LOGGER = Logger.getLogger(RecipeController.class.getName());
|
protected static final Logger LOGGER = Logger.getLogger(RecipeManager.class.getName());
|
||||||
|
|
||||||
private static RecipeController INSTANCE;
|
|
||||||
protected static final Map<PlayerInstance, RecipeItemMaker> _activeMakers = Collections.synchronizedMap(new WeakHashMap<PlayerInstance, RecipeItemMaker>());
|
protected static final Map<PlayerInstance, RecipeItemMaker> _activeMakers = Collections.synchronizedMap(new WeakHashMap<PlayerInstance, RecipeItemMaker>());
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
|
||||||
{
|
|
||||||
return INSTANCE == null ? INSTANCE = new RecipeController() : INSTANCE;
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void requestBookOpen(PlayerInstance player, boolean isDwarvenCraft)
|
public synchronized void requestBookOpen(PlayerInstance player, boolean isDwarvenCraft)
|
||||||
{
|
{
|
||||||
RecipeItemMaker maker = null;
|
RecipeItemMaker maker = null;
|
||||||
@ -82,7 +76,7 @@ public class RecipeController
|
|||||||
|
|
||||||
public synchronized void requestMakeItemAbort(PlayerInstance player)
|
public synchronized void requestMakeItemAbort(PlayerInstance player)
|
||||||
{
|
{
|
||||||
_activeMakers.remove(player); // TODO: anything else here?
|
_activeMakers.remove(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized void requestManufactureItem(PlayerInstance manufacturer, int recipeListId, PlayerInstance player)
|
public synchronized void requestManufactureItem(PlayerInstance manufacturer, int recipeListId, PlayerInstance player)
|
||||||
@ -703,4 +697,14 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
return recipeList;
|
return recipeList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static RecipeManager getInstance()
|
||||||
|
{
|
||||||
|
return SingletonHolder.INSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class SingletonHolder
|
||||||
|
{
|
||||||
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -40,7 +40,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import org.l2jmobius.gameserver.ai.PlayerAI;
|
import org.l2jmobius.gameserver.ai.PlayerAI;
|
||||||
@ -84,6 +83,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.RebirthManager;
|
import org.l2jmobius.gameserver.instancemanager.RebirthManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.events.CTF;
|
import org.l2jmobius.gameserver.instancemanager.events.CTF;
|
||||||
import org.l2jmobius.gameserver.instancemanager.events.DM;
|
import org.l2jmobius.gameserver.instancemanager.events.DM;
|
||||||
@ -13757,7 +13757,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Throwable t)
|
catch (Throwable t)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -47,6 +47,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -58,6 +58,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
|
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.conditions.Condition;
|
import org.l2jmobius.gameserver.model.conditions.Condition;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.conditions.Condition;
|
import org.l2jmobius.gameserver.model.conditions.Condition;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -53,11 +53,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -737,13 +737,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -49,7 +49,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import org.l2jmobius.gameserver.ai.PlayerAI;
|
import org.l2jmobius.gameserver.ai.PlayerAI;
|
||||||
@ -113,6 +112,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
|
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -11318,7 +11318,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.conditions.Condition;
|
import org.l2jmobius.gameserver.model.conditions.Condition;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.model.conditions.Condition;
|
import org.l2jmobius.gameserver.model.conditions.Condition;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -53,11 +53,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -737,13 +737,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -49,7 +49,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import org.l2jmobius.gameserver.ai.PlayerAI;
|
import org.l2jmobius.gameserver.ai.PlayerAI;
|
||||||
@ -113,6 +112,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
|
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -11211,7 +11211,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -755,13 +755,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -52,7 +52,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -124,6 +123,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10817,7 +10817,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -755,13 +755,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -52,7 +52,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -124,6 +123,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10817,7 +10817,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -755,13 +755,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -52,7 +52,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -124,6 +123,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10803,7 +10803,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -755,13 +755,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -53,7 +53,6 @@ import org.l2jmobius.commons.util.Chronos;
|
|||||||
import org.l2jmobius.commons.util.CommonUtil;
|
import org.l2jmobius.commons.util.CommonUtil;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -126,6 +125,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10830,7 +10830,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -755,13 +755,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -53,7 +53,6 @@ import org.l2jmobius.commons.util.Chronos;
|
|||||||
import org.l2jmobius.commons.util.CommonUtil;
|
import org.l2jmobius.commons.util.CommonUtil;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -126,6 +125,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10830,7 +10830,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -755,13 +755,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -54,7 +54,6 @@ import org.l2jmobius.commons.util.Chronos;
|
|||||||
import org.l2jmobius.commons.util.CommonUtil;
|
import org.l2jmobius.commons.util.CommonUtil;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -130,6 +129,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10775,7 +10775,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenCommonRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, false);
|
RecipeManager.getInstance().requestBookOpen(player, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package handlers.effecthandlers;
|
package handlers.effecthandlers;
|
||||||
|
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.StatSet;
|
import org.l2jmobius.gameserver.model.StatSet;
|
||||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
@ -57,6 +57,6 @@ public class OpenDwarfRecipeBook extends AbstractEffect
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, true);
|
RecipeManager.getInstance().requestBookOpen(player, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.l2jmobius.gameserver;
|
package org.l2jmobius.gameserver.instancemanager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -54,11 +54,11 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
|||||||
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
public class RecipeController
|
public class RecipeManager
|
||||||
{
|
{
|
||||||
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
protected RecipeController()
|
protected RecipeManager()
|
||||||
{
|
{
|
||||||
// Prevent external initialization.
|
// Prevent external initialization.
|
||||||
}
|
}
|
||||||
@ -755,13 +755,13 @@ public class RecipeController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RecipeController getInstance()
|
public static RecipeManager getInstance()
|
||||||
{
|
{
|
||||||
return SingletonHolder.INSTANCE;
|
return SingletonHolder.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final RecipeController INSTANCE = new RecipeController();
|
protected static final RecipeManager INSTANCE = new RecipeManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -50,7 +50,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
|
|||||||
import org.l2jmobius.commons.util.Chronos;
|
import org.l2jmobius.commons.util.Chronos;
|
||||||
import org.l2jmobius.commons.util.Rnd;
|
import org.l2jmobius.commons.util.Rnd;
|
||||||
import org.l2jmobius.gameserver.LoginServerThread;
|
import org.l2jmobius.gameserver.LoginServerThread;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI;
|
import org.l2jmobius.gameserver.ai.CreatureAI;
|
||||||
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
import org.l2jmobius.gameserver.ai.CreatureAI.IntentionCommand;
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
@ -122,6 +121,7 @@ import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
|
|||||||
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
import org.l2jmobius.gameserver.instancemanager.MentorManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
import org.l2jmobius.gameserver.instancemanager.QuestManager;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
import org.l2jmobius.gameserver.instancemanager.SellBuffsManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import org.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
@ -10813,7 +10813,7 @@ public class PlayerInstance extends Playable
|
|||||||
// Stop crafting, if in progress
|
// Stop crafting, if in progress
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestMakeItemAbort(this);
|
RecipeManager.getInstance().requestMakeItemAbort(this);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
@ -54,6 +54,6 @@ public class RequestRecipeBookOpen implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
RecipeManager.getInstance().requestBookOpen(player, _isDwarvenCraft);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
|
|
||||||
@ -62,6 +62,6 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RecipeController.getInstance().requestMakeItem(player, _id);
|
RecipeManager.getInstance().requestMakeItem(player, _id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
package org.l2jmobius.gameserver.network.clientpackets;
|
package org.l2jmobius.gameserver.network.clientpackets;
|
||||||
|
|
||||||
import org.l2jmobius.commons.network.PacketReader;
|
import org.l2jmobius.commons.network.PacketReader;
|
||||||
import org.l2jmobius.gameserver.RecipeController;
|
|
||||||
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
import org.l2jmobius.gameserver.enums.PrivateStoreType;
|
||||||
|
import org.l2jmobius.gameserver.instancemanager.RecipeManager;
|
||||||
import org.l2jmobius.gameserver.model.World;
|
import org.l2jmobius.gameserver.model.World;
|
||||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
@ -86,7 +86,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Util.checkIfInRange(150, player, manufacturer, true))
|
if (Util.checkIfInRange(150, player, manufacturer, true))
|
||||||
{
|
{
|
||||||
RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
RecipeManager.getInstance().requestManufactureItem(manufacturer, _recipeId, player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user