Skip to content

Commit 8778209

Browse files
committed
fix: back out last change, it makes no sense
1 parent 47ca173 commit 8778209

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

CHANGELOG.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [21.1.3]
8-
9-
### Added
10-
* Added `RegionFileRelocator#noChunkNBTscan` method to disable chunk NBT scanning during relocation (use with caution!)
11-
127
## [21.1.2]
138

149
### Added

common/src/main/java/dev/ftb/mods/ftbteambases/util/RegionFileRelocator.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public class RegionFileRelocator {
4242
@Nullable
4343
private final UUID playerId;
4444
private boolean started = false;
45-
private boolean chunkNBTscan = true;
4645

4746
public static RegionFileRelocator create(CommandSourceStack source, String templateId, ResourceKey<Level> dimensionKey, RelocatorTracker.Ticker ticker, XZ regionOffset, boolean force) throws IOException {
4847
return RelocatorTracker.INSTANCE.add(new RegionFileRelocator(source, templateId, dimensionKey, regionOffset, force), ticker);
@@ -94,17 +93,6 @@ public Map<Path, RelocationData> getRelocationData() {
9493
return relocationData;
9594
}
9695

97-
/**
98-
* Disable chunk NBT scanning for much faster relocation; <strong>only do this if you know for certain that there
99-
* are no block entities which store absolute block positions!</strong>
100-
*
101-
* @return the relocator itself
102-
*/
103-
public RegionFileRelocator noChunkNBTscan() {
104-
chunkNBTscan = false;
105-
return this;
106-
}
107-
10896
public void start(BooleanConsumer onCompleted) {
10997
if (started) {
11098
throw new IllegalStateException("relocator already started!");
@@ -194,7 +182,7 @@ private boolean relocateOneRegion(Path fromFile, Path workDir, RelocationData da
194182
}
195183

196184
private boolean updateRegionChunkData(RegionFileStorage storage, RegionCoords r, int xOff, int zOff) {
197-
if (!chunkNBTscan || xOff == 0 && zOff == 0) {
185+
if (xOff == 0 && zOff == 0) {
198186
return true; // trivial case
199187
}
200188

0 commit comments

Comments
 (0)