From 900268633d74c2368d69f93dce11ed763244df35 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Tue, 7 Jan 2020 00:41:41 +0000 Subject: [PATCH] Fix compile --- .../com/boydti/fawe/bukkit/wrapper/AsyncWorld.java | 13 +++++++++++-- .../src/main/java/com/boydti/fawe/FaweAPI.java | 1 + .../object/changeset/AbstractDelegateChangeSet.java | 6 ++++++ .../boydti/fawe/object/changeset/CFIChangeSet.java | 5 +++++ .../worldedit/history/changeset/ChangeSet.java | 6 ++++-- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java index a63296229..560a33f54 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java @@ -75,8 +75,7 @@ import org.jetbrains.annotations.Nullable; * @see #wrap(World) * @see #create(WorldCreator) */ -public class AsyncWorld - extends PassthroughExtent implements World { +public class AsyncWorld extends PassthroughExtent implements World { private World parent; private BukkitImplAdapter adapter; @@ -927,6 +926,16 @@ public class AsyncWorld return parent.canGenerateStructures(); } + @Override + public void setHardcore(boolean hardcore) { + parent.setHardcore(hardcore); + } + + @Override + public boolean isHardcore() { + return parent.isHardcore(); + } + @Override public long getTicksPerAnimalSpawns() { return parent.getTicksPerAnimalSpawns(); diff --git a/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java b/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java index 71222399c..315b30597 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java @@ -4,6 +4,7 @@ import com.boydti.fawe.beta.IQueueExtent; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.RegionWrapper; import com.boydti.fawe.object.changeset.DiskStorageHistory; +import com.boydti.fawe.object.changeset.SimpleChangeSetSummary; import com.boydti.fawe.object.exception.FaweException; import com.boydti.fawe.object.extent.LightingExtent; import com.boydti.fawe.regions.FaweMaskManager; diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractDelegateChangeSet.java b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractDelegateChangeSet.java index c59c1d5c9..feaf26636 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractDelegateChangeSet.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractDelegateChangeSet.java @@ -8,6 +8,7 @@ import com.sk89q.worldedit.history.change.BlockChange; import com.sk89q.worldedit.history.change.Change; import com.sk89q.worldedit.history.change.EntityCreate; import com.sk89q.worldedit.history.change.EntityRemove; +import com.sk89q.worldedit.history.changeset.ChangeSetSummary; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.world.World; @@ -117,6 +118,11 @@ public class AbstractDelegateChangeSet extends AbstractChangeSet { parent.delete(); } + @Override + public ChangeSetSummary summarize(Region region, boolean shallow) { + return parent.summarize(region, shallow); + } + @Override public EditSession toEditSession(Player player) { return parent.toEditSession(player); diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/CFIChangeSet.java b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/CFIChangeSet.java index be8cecfcc..4a24e600b 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/CFIChangeSet.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/CFIChangeSet.java @@ -7,11 +7,16 @@ import com.boydti.fawe.object.change.CFIChange; import com.boydti.fawe.util.MainUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.history.change.Change; +import com.sk89q.worldedit.history.changeset.ChangeSetSummary; +import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.world.biome.BiomeType; +import com.sk89q.worldedit.world.block.BlockState; + import java.io.File; import java.io.IOException; import java.util.Collections; import java.util.Iterator; +import java.util.Map; import java.util.UUID; public class CFIChangeSet extends AbstractChangeSet { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/ChangeSet.java b/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/ChangeSet.java index 57887b7e1..6d744e0a7 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/ChangeSet.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/history/changeset/ChangeSet.java @@ -98,12 +98,14 @@ public interface ChangeSet extends Closeable { default void delete() {} /** - * Get a summary of this changeset + * Get a summary of this changeset (or null) * @param region * @param shallow * @return */ - ChangeSetSummary summarize(Region region, boolean shallow); + default ChangeSetSummary summarize(Region region, boolean shallow) { + return null; + } /** * Get if the changeset is empty (i.e. size == 0)