From 241b9673bbc3cde8fced9f18589ec74d2685a6a2 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 30 Dec 2019 11:59:04 +0000 Subject: [PATCH] Use thenAccept instead of whenComplete --- .../net/islandearth/rpgregions/listener/RegionListener.java | 2 +- .../islandearth/rpgregions/managers/data/sql/SqlStorage.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java b/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java index ecbab02..7c1f0ab 100644 --- a/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java +++ b/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java @@ -28,7 +28,7 @@ public class RegionListener implements Listener { @EventHandler public void onEnter(RegionsEnterEvent ree) { Player player = ree.getPlayer(); - plugin.getManagers().getStorageManager().getAccount(player.getUniqueId()).whenComplete((account, err) -> { + plugin.getManagers().getStorageManager().getAccount(player.getUniqueId()).thenAccept(account -> { for (Discovery discovery : account.getDiscoveredRegions()) { String region = discovery.getRegion(); boolean has = false; diff --git a/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java b/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java index 5f1407e..08a23f4 100644 --- a/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java +++ b/src/main/java/net/islandearth/rpgregions/managers/data/sql/SqlStorage.java @@ -51,7 +51,7 @@ public class SqlStorage implements StorageManager { if (cachedAccounts.containsKey(uuid)) { future.complete(cachedAccounts.get(uuid)); } else { - DB.getResultsAsync(SELECT_REGION, getDatabaseUuid(uuid)).whenComplete((results, error) -> { + DB.getResultsAsync(SELECT_REGION, getDatabaseUuid(uuid)).thenAccept(results -> { List regions = new ArrayList<>(); for (DbRow row : results) { regions.add(new WorldDiscovery(Date.valueOf(row.getString("time")), row.getString("region"))); @@ -74,7 +74,7 @@ public class SqlStorage implements StorageManager { public void removeCachedAccount(UUID uuid) { RPGRegionsAccount account = cachedAccounts.get(uuid); List current = new ArrayList<>(); - DB.getResultsAsync(SELECT_REGION, getDatabaseUuid(uuid)).whenComplete((results, error) -> { + DB.getResultsAsync(SELECT_REGION, getDatabaseUuid(uuid)).thenAccept(results -> { for (DbRow row : results) { current.add(new WorldDiscovery(Date.valueOf(row.getString("time")), row.getString("region"))); }