From 5224d41be93c070f52b6cb9df26a1dfe04729733 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 28 Feb 2019 14:03:21 +0000 Subject: [PATCH] Disable unstuck command for neutral faction players. --- .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ .../data/scripts/handlers/usercommandhandlers/Unstuck.java | 6 ++++++ 11 files changed, 66 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 1647668ed1..6ff9e9276d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -57,6 +57,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 2f5c0c0892..1c907a8ca4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -47,6 +47,12 @@ public class Unstuck implements IUserCommandHandler return false; } + if (Config.FACTION_SYSTEM_ENABLED && !activeChar.isGood() && !activeChar.isEvil()) + { + activeChar.sendMessage("You cannot use this function while you are neutral."); + return false; + } + final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); if (activeChar.isInOlympiadMode())