diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 68924182ad..a3b3adbda0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 68924182ad..a3b3adbda0 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 68924182ad..a3b3adbda0 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 68924182ad..a3b3adbda0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 68924182ad..a3b3adbda0 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 68924182ad..a3b3adbda0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 350acbf245..bc3736829f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -127,7 +127,6 @@ import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.stats.functions.AbstractFunction; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -4259,26 +4258,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 7f6549125c..d698ff0aa2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 7f6549125c..d698ff0aa2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 7f6549125c..d698ff0aa2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 7f6549125c..d698ff0aa2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -132,7 +132,6 @@ import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneRegion; -import com.l2jmobius.gameserver.network.Disconnection; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.Attack; @@ -3257,26 +3256,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - // Temporary fix for character outside world region errors (should not happen) - if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) - { - LOGGER.warning("Character " + getName() + " outside world area, in coordinates x:" + curX + " y:" + curY); - getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - if (isPlayer()) - { - Disconnection.of(getActingPlayer()).defaultSequence(false); - } - else if (isSummon()) - { - return; - } - else - { - onDecay(); - } - return; - } - if (!isInVehicle // Not in vehicle. && !(isPlayer() && (distance > 3000)) // Should be able to click far away and move. && !(isMonster() && (Math.abs(dz) > 100)) // Monsters can move on ledges.