From b46e10e835fe32e8375a4ac47fd1bd03e6d0f732 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 11 Feb 2025 14:51:06 -0600 Subject: [PATCH] copy constructors --- src/main/java/one/oth3r/sit/file/CustomBlock.java | 6 ++++++ src/main/java/one/oth3r/sit/file/ServerConfig.java | 10 +--------- src/main/java/one/oth3r/sit/file/SittingBlock.java | 5 +++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/one/oth3r/sit/file/CustomBlock.java b/src/main/java/one/oth3r/sit/file/CustomBlock.java index 6f8f0f7..e9b8769 100644 --- a/src/main/java/one/oth3r/sit/file/CustomBlock.java +++ b/src/main/java/one/oth3r/sit/file/CustomBlock.java @@ -28,6 +28,12 @@ public class CustomBlock { this.blockStates = blockStates; } + public CustomBlock(CustomBlock customBlock) { + this.blockIds = new ArrayList<>(customBlock.blockIds); + this.blockTags = new ArrayList<>(customBlock.blockTags); + this.blockStates = new ArrayList<>(customBlock.blockStates); + } + public ArrayList getBlockIds() { return blockIds; } diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java index 05c604e..ed84611 100644 --- a/src/main/java/one/oth3r/sit/file/ServerConfig.java +++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java @@ -43,15 +43,7 @@ public class ServerConfig implements CustomFile { public ServerConfig() {} public ServerConfig(ServerConfig serverConfig) { - this.version = serverConfig.version; - this.lang = serverConfig.lang; - this.keepActive = serverConfig.keepActive; - this.sitWhileSeated = serverConfig.sitWhileSeated; - this.presetBlocks = serverConfig.presetBlocks; - this.customEnabled = serverConfig.customEnabled; - this.sittingBlocks = serverConfig.sittingBlocks; - this.blacklistedBlocks = serverConfig.blacklistedBlocks; - this.interactionBlocks = serverConfig.interactionBlocks; + loadFileData(serverConfig); } public ServerConfig(Double version, String lang, boolean keepActive, boolean sitWhileSeated, diff --git a/src/main/java/one/oth3r/sit/file/SittingBlock.java b/src/main/java/one/oth3r/sit/file/SittingBlock.java index 1f2cf36..149cfc0 100644 --- a/src/main/java/one/oth3r/sit/file/SittingBlock.java +++ b/src/main/java/one/oth3r/sit/file/SittingBlock.java @@ -22,4 +22,9 @@ public class SittingBlock extends CustomBlock { super(blockIds, blockTags, blockStates); this.sittingHeight = sittingHeight; } + + public SittingBlock(SittingBlock sittingBlock) { + super(sittingBlock); + this.sittingHeight = sittingBlock.sittingHeight; + } }