From 9db9f9ad20f0fe7537185e48bbf9257fa18ce331 Mon Sep 17 00:00:00 2001 From: Stefan Dollase Date: Sun, 20 Nov 2016 22:19:19 +0100 Subject: [PATCH] removed parameter assignments --- src/main/java/amidst/gui/main/menu/Menus.java | 9 +-------- .../world/icon/locationchecker/StructureAlgorithm.java | 8 ++++---- .../world/player/PlayerInformationCacheImpl.java | 8 ++++---- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/main/java/amidst/gui/main/menu/Menus.java b/src/main/java/amidst/gui/main/menu/Menus.java index a2ae20db..74779551 100644 --- a/src/main/java/amidst/gui/main/menu/Menus.java +++ b/src/main/java/amidst/gui/main/menu/Menus.java @@ -134,14 +134,7 @@ public enum Menus { } public static KeyStroke getAcceleratorKeyStroke(String accelerator) { - boolean addMenuMask; - if (accelerator.contains("menu")) { - accelerator = accelerator.replace("menu", ""); - addMenuMask = true; - } else { - addMenuMask = false; - } - return getPlatformSpecificKeyStroke(accelerator, addMenuMask); + return getPlatformSpecificKeyStroke(accelerator.replace("menu", ""), accelerator.contains("menu")); } private static KeyStroke getPlatformSpecificKeyStroke(String accelerator, boolean addMenuMask) { diff --git a/src/main/java/amidst/mojangapi/world/icon/locationchecker/StructureAlgorithm.java b/src/main/java/amidst/mojangapi/world/icon/locationchecker/StructureAlgorithm.java index 6b7fc934..36b41a46 100644 --- a/src/main/java/amidst/mojangapi/world/icon/locationchecker/StructureAlgorithm.java +++ b/src/main/java/amidst/mojangapi/world/icon/locationchecker/StructureAlgorithm.java @@ -64,13 +64,13 @@ public class StructureAlgorithm implements LocationChecker { } private int updateValue(Random random, int value) { - value *= maxDistanceBetweenScatteredFeatures; + int result = value * maxDistanceBetweenScatteredFeatures; if (useTwoValuesForUpdate) { - value += (random.nextInt(distanceBetweenScatteredFeaturesRange) + result += (random.nextInt(distanceBetweenScatteredFeaturesRange) + random.nextInt(distanceBetweenScatteredFeaturesRange)) / 2; } else { - value += random.nextInt(distanceBetweenScatteredFeaturesRange); + result += random.nextInt(distanceBetweenScatteredFeaturesRange); } - return value; + return result; } } diff --git a/src/main/java/amidst/mojangapi/world/player/PlayerInformationCacheImpl.java b/src/main/java/amidst/mojangapi/world/player/PlayerInformationCacheImpl.java index 01889264..1462d82f 100644 --- a/src/main/java/amidst/mojangapi/world/player/PlayerInformationCacheImpl.java +++ b/src/main/java/amidst/mojangapi/world/player/PlayerInformationCacheImpl.java @@ -22,13 +22,13 @@ public class PlayerInformationCacheImpl implements PlayerInformationCache { @NotNull @Override public PlayerInformation getByUUID(String uuid) { - uuid = getCleanUUID(uuid); - PlayerInformation result = byUUID.get(uuid); + String cleanUUID = getCleanUUID(uuid); + PlayerInformation result = byUUID.get(cleanUUID); if (result != null) { return result; } else { - Log.i("requesting player information for uuid: " + uuid); - result = PlayerInformation.fromUUID(uuid); + Log.i("requesting player information for uuid: " + cleanUUID); + result = PlayerInformation.fromUUID(cleanUUID); put(result); return result; }