Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.fastasyncworldedit.bukkit.regions.WorldGuardFeature;
import com.fastasyncworldedit.bukkit.util.BukkitTaskManager;
import com.fastasyncworldedit.bukkit.util.ItemUtil;
import com.fastasyncworldedit.bukkit.util.MinecraftVersion;
import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer;
import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
import com.fastasyncworldedit.core.Fawe;
Expand Down Expand Up @@ -58,7 +57,6 @@ public class FaweBukkit implements IFawe, Listener {
private static final Logger LOGGER = LogManagerCompat.getLogger();

private final Plugin plugin;
private final boolean chunksStretched;
private final FAWEPlatformAdapterImpl platformAdapter;
private ItemUtil itemUtil;
private Preloader preloader;
Expand All @@ -82,10 +80,6 @@ public FaweBukkit(Plugin plugin) {
Bukkit.getServer().shutdown();
}

MinecraftVersion version = MinecraftVersion.getCurrent();

chunksStretched = version.isEqualOrHigherThan(MinecraftVersion.NETHER);

platformAdapter = new NMSAdapter();

//PlotSquared support is limited to Spigot/Paper as of 02/20/2020
Expand All @@ -105,8 +99,8 @@ public FaweBukkit(Plugin plugin) {
});

// Warn if small-edits are enabled with extended world heights
if (version.isEqualOrHigherThan(MinecraftVersion.CAVES_18) && Settings.settings().HISTORY.SMALL_EDITS) {
LOGGER.warn("Small-edits enabled (maximum y range of 0 -> 256) with 1.18 world heights. Are you sure?");
if (Settings.settings().HISTORY.SMALL_EDITS) {
LOGGER.warn("Small-edits enabled (maximum y range of 0 -> 256) with 1.18+ world heights. Are you sure?");
}
}

Expand Down Expand Up @@ -302,11 +296,6 @@ public Preloader getPreloader(boolean initialise) {
return null;
}

@Override
public boolean isChunksStretched() {
return chunksStretched;
}

@Override
public FAWEPlatformAdapterImpl getPlatformAdapter() {
return platformAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ default String getDebugInfo() {
*/
Preloader getPreloader(boolean initialise);

@Deprecated(forRemoval = true, since = "TODO")
default boolean isChunksStretched() {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public byte[] getSectionBytes() {
if (sectionBytes == null) {
IBlocks tmpChunk = getChunk();
byte[] buf = FaweCache.INSTANCE.BYTE_BUFFER_8192.get();
sectionBytes = tmpChunk.toByteArray(buf, tmpChunk.getBitMask(), this.full, Fawe.platform().isChunksStretched());
sectionBytes = tmpChunk.toByteArray(buf, tmpChunk.getBitMask(), this.full, true);
}
tmp = sectionBytes;
}
Expand Down
Loading