From 79258dfa15b8ec015dadd9f710a3aee9b4a50e23 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 30 Jun 2019 23:21:00 +0000 Subject: [PATCH] Necessary check for RecipeController. --- .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ .../model/actor/instance/PlayerInstance.java | 11 +++++++++++ 8 files changed, 88 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 32473c8322..efc6cf1a50 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10913,6 +10914,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5d83c06e1c..fc96b73552 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10920,6 +10921,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a42fa25250..70d751f41c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10922,6 +10923,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 85b5312182..2598b044e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10848,6 +10849,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5e03ac67fe..09c092a39c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10855,6 +10856,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b95600f0b0..7135463a71 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10840,6 +10841,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8c7e3db695..bb9bf77623 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10840,6 +10841,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b398a405a3..c2dedd6cc1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -51,6 +51,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; +import org.l2jmobius.gameserver.RecipeController; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.PlayerAI; @@ -10840,6 +10841,16 @@ public final class PlayerInstance extends Playable LOGGER.log(Level.SEVERE, "deleteMe()", e); } + // Stop crafting, if in progress + try + { + RecipeController.getInstance().requestMakeItemAbort(this); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "deleteMe()", e); + } + // Cancel Attak or Cast try {