From 633d0293b60767bdcdffe679a2bc25b5bfb8942b Mon Sep 17 00:00:00 2001 From: Brianna Date: Wed, 15 May 2019 20:17:55 -0400 Subject: [PATCH] Toggle for block break will not be saved. (MySQL will need updating). --- .../main/java/com/songoda/epichoppers/EpicHoppersPlugin.java | 4 ++++ .../main/java/com/songoda/epichoppers/storage/Storage.java | 2 ++ .../java/com/songoda/epichoppers/utils/MySQLDatabase.java | 1 + 3 files changed, 7 insertions(+) diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java index 673e251..bc09c09 100644 --- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java @@ -261,6 +261,8 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers { String blackLoc = row.get("black").asString(); Location black = blackLoc == null ? null : Methods.unserializeLocation(blackLoc); + boolean autoBreak = row.get("autobreak").asBoolean(); + EFilter filter = new EFilter(); filter.setWhiteList(whiteList); @@ -270,6 +272,8 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers { EHopper hopper = new EHopper(location, levelManager.getLevel(level), lastPlayer, placedBy, blocks, filter, teleportTrigger, autoCrafting); + if (autoBreak) hopper.toggleAutoBreaking(); + hopperManager.addHopper(location, hopper); } } diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java index 291b622..e58f931 100644 --- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java @@ -3,6 +3,7 @@ package com.songoda.epichoppers.storage; import com.songoda.epichoppers.EpicHoppersPlugin; import com.songoda.epichoppers.api.hopper.Hopper; import com.songoda.epichoppers.boost.BoostData; +import com.songoda.epichoppers.hopper.EHopper; import com.songoda.epichoppers.utils.ConfigWrapper; import com.songoda.epichoppers.utils.Methods; import org.bukkit.Material; @@ -50,6 +51,7 @@ public abstract class Storage { new StorageItem("whitelist", hopper.getFilter().getWhiteList()), new StorageItem("blacklist", hopper.getFilter().getBlackList()), new StorageItem("void", hopper.getFilter().getVoidList()), + new StorageItem("autobreak", ((EHopper)hopper).isAutoBreaking()), new StorageItem("black", hopper.getFilter().getEndPoint() == null ? null : Methods.serializeLocation(hopper.getFilter().getEndPoint()))); } diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java index ff8f3da..c8253f6 100644 --- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java +++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/MySQLDatabase.java @@ -34,6 +34,7 @@ public class MySQLDatabase { "\t`blacklist` TEXT NULL,\n" + "\t`void` TEXT NULL,\n" + "\t`black` TEXT NULL\n" + + "\t`autobreak` TEXT NULL\n" + ")"); connection.createStatement().execute("CREATE TABLE IF NOT EXISTS `" + instance.getConfig().getString("Database.Prefix") + "boosts` (\n" +