From 7532f2c5062dd7c65121980529d146c70baf6fb4 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Thu, 4 Oct 2018 12:07:26 +0900 Subject: [PATCH] Minor fix to how Common/Client Proxy handles init --- .../TurnBasedMinecraft/client/ClientProxy.java | 6 ++---- .../TurnBasedMinecraft/common/CommonProxy.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java index 9e0758b..35a1367 100644 --- a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java +++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java @@ -18,9 +18,8 @@ public class ClientProxy extends CommonProxy private Battle localBattle = null; @Override - public void initialize() + protected void initializeClient() { - super.initialize(); battleGui = new BattleGui(); battleMusic = null; // will be initialized in postInit() battleMusicCount = 0; @@ -84,9 +83,8 @@ public class ClientProxy extends CommonProxy } @Override - public void postInit() + protected void postInitClient() { - super.postInit(); battleMusic = new BattleMusic(getLogger()); } diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java index bd1d968..a954e57 100644 --- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java +++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java @@ -17,11 +17,14 @@ public class CommonProxy private Config config = null; private Logger logger = null; - public void initialize() + public final void initialize() { attackerViaBow = new HashSet(); + initializeClient(); } + protected void initializeClient() {} + public final boolean initializeBattleManager() { if(battleManager == null) @@ -57,11 +60,14 @@ public class CommonProxy public void battleEnded() {} - public void postInit() + public final void postInit() { config = new Config(logger); + postInitClient(); } + protected void postInitClient() {} + public final void setLogger(Logger logger) { this.logger = logger;