Skip to content

Commit fdc9d6d

Browse files
authored
Remove outdated version checks (#3153)
1 parent a088908 commit fdc9d6d

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.fastasyncworldedit.bukkit.regions.WorldGuardFeature;
1313
import com.fastasyncworldedit.bukkit.util.BukkitTaskManager;
1414
import com.fastasyncworldedit.bukkit.util.ItemUtil;
15-
import com.fastasyncworldedit.bukkit.util.MinecraftVersion;
1615
import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer;
1716
import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
1817
import com.fastasyncworldedit.core.Fawe;
@@ -58,7 +57,6 @@ public class FaweBukkit implements IFawe, Listener {
5857
private static final Logger LOGGER = LogManagerCompat.getLogger();
5958

6059
private final Plugin plugin;
61-
private final boolean chunksStretched;
6260
private final FAWEPlatformAdapterImpl platformAdapter;
6361
private ItemUtil itemUtil;
6462
private Preloader preloader;
@@ -82,10 +80,6 @@ public FaweBukkit(Plugin plugin) {
8280
Bukkit.getServer().shutdown();
8381
}
8482

85-
MinecraftVersion version = MinecraftVersion.getCurrent();
86-
87-
chunksStretched = version.isEqualOrHigherThan(MinecraftVersion.NETHER);
88-
8983
platformAdapter = new NMSAdapter();
9084

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

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

@@ -302,11 +296,6 @@ public Preloader getPreloader(boolean initialise) {
302296
return null;
303297
}
304298

305-
@Override
306-
public boolean isChunksStretched() {
307-
return chunksStretched;
308-
}
309-
310299
@Override
311300
public FAWEPlatformAdapterImpl getPlatformAdapter() {
312301
return platformAdapter;

worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ default String getDebugInfo() {
4343
*/
4444
Preloader getPreloader(boolean initialise);
4545

46+
@Deprecated(forRemoval = true, since = "TODO")
4647
default boolean isChunksStretched() {
4748
return true;
4849
}

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/packet/ChunkPacket.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public byte[] getSectionBytes() {
6565
if (sectionBytes == null) {
6666
IBlocks tmpChunk = getChunk();
6767
byte[] buf = FaweCache.INSTANCE.BYTE_BUFFER_8192.get();
68-
sectionBytes = tmpChunk.toByteArray(buf, tmpChunk.getBitMask(), this.full, Fawe.platform().isChunksStretched());
68+
sectionBytes = tmpChunk.toByteArray(buf, tmpChunk.getBitMask(), this.full, true);
6969
}
7070
tmp = sectionBytes;
7171
}

0 commit comments

Comments
 (0)