diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 380c7a3..7a6bdc4 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -155,10 +155,10 @@ } private void updateAreaURI() { - String[] areaURISplit = areaURI.split("/"); // �c�c/instances/{instanceId}/areas/{areaId} - int splitSize = areaURISplit.length; - String instanceId = areaURISplit[splitSize - 3]; - String previousAreaId = areaURISplit[splitSize - 1]; + String[] splitedAreaURI = areaURI.split("/"); // �c�c/instances/{instanceId}/areas/{areaId} + int splitSize = splitedAreaURI.length; + String instanceId = splitedAreaURI[splitSize - 3]; + String previousAreaId = splitedAreaURI[splitSize - 1]; Instance instance = Instances.getInstance().getInstance(instanceId); Area previousArea = instance.getArea(previousAreaId); if (!previousArea.isSurroundingPosition(position)) { diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 14f9d41..c89d46a 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -106,8 +106,8 @@ HashMap returnedMap = new HashMap<>(); for (String id : characterMap.keySet()) { Character character = characterMap.get(id); - String[] accountURISplit = character.getAccountURI().split("/"); - if (accountURISplit[accountURISplit.length - 1].equals(accountID)) { + String[] splitedAccountURI = character.getAccountURI().split("/"); + if (splitedAccountURI[splitedAccountURI.length - 1].equals(accountID)) { returnedMap.put(id, character); } } diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 171b79c..e361d32 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -23,7 +23,7 @@ @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; @JSONHint(ignore = true) - public static final long STOP_TIME_LIMIT = (long) (30 * 1e+9); + public static final long INACTIVE_TIME_LIMIT = (long) (30 * 1e+9); private Player() { // JSONDecode���̌Ăяo���p @@ -151,10 +151,10 @@ } private void updateAreaURI() { - String[] areaURISplit = areaURI.split("/"); // �c�c/instances/{instanceId}/areas/{areaId} - int splitSize = areaURISplit.length; - String instanceId = areaURISplit[splitSize - 3]; - String previousAreaId = areaURISplit[splitSize - 1]; + String[] splitedAreaURI = areaURI.split("/"); // �c�c/instances/{instanceId}/areas/{areaId} + int splitSize = splitedAreaURI.length; + String instanceId = splitedAreaURI[splitSize - 3]; + String previousAreaId = splitedAreaURI[splitSize - 1]; Instance instance = Instances.getInstance().getInstance(instanceId); Area previousArea = instance.getArea(previousAreaId); if (!previousArea.isSurroundingPosition(position)) { diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 0b53e96..e45fffa 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -141,7 +141,7 @@ // System.out.println( // currentTime + ", " + (lastUpdateTime + Player.STOP_TIME_LIMIT) + " // // playerId: " + playerId); - if (currentTime > (lastUpdateTime + Player.STOP_TIME_LIMIT)) { + if (currentTime > (lastUpdateTime + Player.INACTIVE_TIME_LIMIT)) { System.out.println("delete started (playerId: " + playerId + ")"); player.destroy(); it.remove();