Addition of config for disabling player keyboard movement.

This commit is contained in:
MobiusDev
2018-04-27 13:02:22 +00:00
parent b8e69c3dab
commit e096c1b5e4
40 changed files with 182 additions and 4 deletions

View File

@@ -704,6 +704,10 @@ RaidLootRightsCCSize = 45
# Default: 0
AutoLootItemIds = 0
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# This is the time in seconds that it will take for the player command "/unstuck" to activate.
# Default: 300
UnstuckInterval = 300

View File

@@ -263,6 +263,7 @@ public final class Config
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1714,6 +1715,7 @@ public final class Config
AUTO_LOOT_ITEM_IDS.add(itm);
}
}
ENABLE_KEYBOARD_MOVEMENT = Character.getBoolean("KeyboardMovement", true);
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0);

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -42,6 +43,11 @@ public final class FinishRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -116,6 +116,10 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -41,6 +42,11 @@ public final class StartRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -704,6 +704,10 @@ RaidLootRightsCCSize = 45
# Default: 0
AutoLootItemIds = 0
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# This is the time in seconds that it will take for the player command "/unstuck" to activate.
# Default: 300
UnstuckInterval = 300

View File

@@ -269,6 +269,7 @@ public final class Config
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1729,6 +1730,7 @@ public final class Config
AUTO_LOOT_ITEM_IDS.add(itm);
}
}
ENABLE_KEYBOARD_MOVEMENT = Character.getBoolean("KeyboardMovement", true);
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0);

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -42,6 +43,11 @@ public final class FinishRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -116,6 +116,10 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -41,6 +42,11 @@ public final class StartRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -704,6 +704,10 @@ RaidLootRightsCCSize = 45
# Default: 0
AutoLootItemIds = 0
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# This is the time in seconds that it will take for the player command "/unstuck" to activate.
# Default: 300
UnstuckInterval = 300

View File

@@ -269,6 +269,7 @@ public final class Config
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1737,6 +1738,7 @@ public final class Config
AUTO_LOOT_ITEM_IDS.add(itm);
}
}
ENABLE_KEYBOARD_MOVEMENT = Character.getBoolean("KeyboardMovement", true);
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0);

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -42,6 +43,11 @@ public final class FinishRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -116,6 +116,10 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -41,6 +42,11 @@ public final class StartRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -704,6 +704,10 @@ RaidLootRightsCCSize = 45
# Default: 0
AutoLootItemIds = 0
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# This is the time in seconds that it will take for the player command "/unstuck" to activate.
# Default: 300
UnstuckInterval = 300

View File

@@ -269,6 +269,7 @@ public final class Config
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1736,6 +1737,7 @@ public final class Config
AUTO_LOOT_ITEM_IDS.add(itm);
}
}
ENABLE_KEYBOARD_MOVEMENT = Character.getBoolean("KeyboardMovement", true);
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0);

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -42,6 +43,11 @@ public final class FinishRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -116,6 +116,10 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -41,6 +42,11 @@ public final class StartRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -74,6 +74,10 @@ RaidMaxRespawnMultiplier = 1.0
# Minions respawn timer 300000 = 5 mins
RaidMinionRespawnTime = 300000
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# Unstuck interval, seconds, default is 300 sec.
UnstuckInterval = 300

View File

@@ -273,6 +273,7 @@ public final class Config
public static List<int[]> STARTING_CUSTOM_ITEMS_F = new ArrayList<>();
public static List<int[]> STARTING_CUSTOM_ITEMS_M = new ArrayList<>();
public static boolean DEEPBLUE_DROP_RULES;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int DEATH_PENALTY_CHANCE;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1607,6 +1608,7 @@ public final class Config
}
}
ENABLE_KEYBOARD_MOVEMENT = Boolean.parseBoolean(otherSettings.getProperty("KeyboardMovement", "true"));
UNSTUCK_INTERVAL = Integer.parseInt(otherSettings.getProperty("UnstuckInterval", "300"));
/* Player protection after teleport or login */

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.serverpackets.StopRotation;
@@ -34,6 +35,11 @@ public final class FinishRotating extends L2GameClientPacket
@Override
protected void runImpl()
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance player = getClient().getActiveChar();
if (player == null)
{

View File

@@ -125,6 +125,10 @@ public class MoveBackwardToLocation extends L2GameClientPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.network.serverpackets.BeginRotation;
public final class StartRotating extends L2GameClientPacket
@@ -33,6 +34,11 @@ public final class StartRotating extends L2GameClientPacket
@Override
protected void runImpl()
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
if (getClient().getActiveChar() == null)
{
return;

View File

@@ -742,6 +742,10 @@ RaidLootRightsCCSize = 45
# Default: 0
AutoLootItemIds = 0
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# This is the time in seconds that it will take for the player command "/unstuck" to activate.
# Default: 300
UnstuckInterval = 300

View File

@@ -263,6 +263,7 @@ public final class Config
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1874,19 +1875,22 @@ public final class Config
AUTO_LOOT_ITEM_IDS = new ArrayList<>(autoLootItemIds.length);
for (String item : autoLootItemIds)
{
Integer itm = 0;
try
{
if (!item.isEmpty())
{
AUTO_LOOT_ITEM_IDS.add(Integer.parseInt(item));
}
itm = Integer.parseInt(item);
}
catch (NumberFormatException nfe)
{
LOGGER.warning("Auto loot item ids: Wrong ItemId passed: " + item);
LOGGER.warning(nfe.getMessage());
}
if (itm != 0)
{
AUTO_LOOT_ITEM_IDS.add(itm);
}
}
ENABLE_KEYBOARD_MOVEMENT = Character.getBoolean("KeyboardMovement", true);
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0);

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -42,6 +43,11 @@ public final class FinishRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -118,6 +118,10 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -41,6 +42,11 @@ public final class StartRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -653,6 +653,10 @@ RaidLootRightsCCSize = 45
# Default: 0
AutoLootItemIds = 0
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# This is the time in seconds that it will take for the player command "/unstuck" to activate.
# Default: 300
UnstuckInterval = 300

View File

@@ -267,6 +267,7 @@ public final class Config
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1658,6 +1659,7 @@ public final class Config
AUTO_LOOT_ITEM_IDS.add(itm);
}
}
ENABLE_KEYBOARD_MOVEMENT = Character.getBoolean("KeyboardMovement", true);
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0);

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -42,6 +43,11 @@ public final class FinishRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -116,6 +116,10 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -41,6 +42,11 @@ public final class StartRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -653,6 +653,10 @@ RaidLootRightsCCSize = 45
# Default: 0
AutoLootItemIds = 0
# Enable keyboard movement.
# Retail: True
KeyboardMovement = True
# This is the time in seconds that it will take for the player command "/unstuck" to activate.
# Default: 300
UnstuckInterval = 300

View File

@@ -267,6 +267,7 @@ public final class Config
public static int LOOT_RAIDS_PRIVILEGE_INTERVAL;
public static int LOOT_RAIDS_PRIVILEGE_CC_SIZE;
public static List<Integer> AUTO_LOOT_ITEM_IDS;
public static boolean ENABLE_KEYBOARD_MOVEMENT;
public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION;
@@ -1662,6 +1663,7 @@ public final class Config
AUTO_LOOT_ITEM_IDS.add(itm);
}
}
ENABLE_KEYBOARD_MOVEMENT = Character.getBoolean("KeyboardMovement", true);
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0);

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -42,6 +43,11 @@ public final class FinishRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{

View File

@@ -116,6 +116,10 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
else // 0
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
activeChar.setCursorKeyMovement(true);
}

View File

@@ -16,6 +16,7 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
@@ -41,6 +42,11 @@ public final class StartRotating implements IClientIncomingPacket
@Override
public void run(L2GameClient client)
{
if (!Config.ENABLE_KEYBOARD_MOVEMENT)
{
return;
}
final L2PcInstance activeChar = client.getActiveChar();
if (activeChar == null)
{