From e7d16b21092e4ed9332f050725418ad10c516532 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 25 Feb 2023 15:27:31 -0600 Subject: [PATCH] refactor DhClientServerWorld --- .../com/seibel/lod/core/world/DhClientServerWorld.java | 10 +++++----- .../java/com/seibel/lod/core/world/DhClientWorld.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java b/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java index 62c7e6826..18dfa9feb 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java @@ -61,17 +61,17 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor { return this.levelObjMap.computeIfAbsent(wrapper, (levelWrapper) -> { - IClientLevelWrapper clientSide = (IClientLevelWrapper) levelWrapper; - IServerLevelWrapper serverSide = clientSide.tryGetServerSideWrapper(); - LodUtil.assertTrue(serverSide != null); + IClientLevelWrapper clientLevelWrapper = (IClientLevelWrapper) levelWrapper; + IServerLevelWrapper serverLevelWrapper = clientLevelWrapper.tryGetServerSideWrapper(); + LodUtil.assertTrue(serverLevelWrapper != null); - DhClientServerLevel level = this.levelObjMap.get(serverSide); + DhClientServerLevel level = this.levelObjMap.get(serverLevelWrapper); if (level == null) { return null; } - level.startRenderer(clientSide); + level.startRenderer(clientLevelWrapper); return level; }); } diff --git a/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java b/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java index f04aa3f97..09c169f71 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java @@ -46,8 +46,8 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld return this.levels.computeIfAbsent((IClientLevelWrapper) wrapper, (clientLevelWrapper) -> { - File level = this.saveStructure.tryGetOrCreateLevelFolder(wrapper); - if (level == null) + File file = this.saveStructure.tryGetOrCreateLevelFolder(wrapper); + if (file == null) { return null; }