SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct headerLocation for regionfile initialisation

Browse Source 
If the regionfile cannot be recalculated (i.e entity/poi type),
then attempts to remove the invalid entry would blow up
This commit is contained in:
Spottedleaf
2022-02-02 06:02:16 -08:00
parent 729db1bed4
commit 950afc93da
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
View File

@@ -160,7 +160,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ try { + try {
+ this.file.force(true); + this.file.force(true);
+ LOGGER.warn("Backing up regionfile \"" + this.regionFile.toAbsolutePath() + "\" to " + to.toAbsolutePath()); + LOGGER.warn("Backing up regionfile \"" + this.regionFile.toAbsolutePath() + "\" to " + to.toAbsolutePath());
+ java.nio.file.Files.copy(this.regionFile, to); + java.nio.file.Files.copy(this.regionFile, to, java.nio.file.StandardCopyOption.COPY_ATTRIBUTES);
+ LOGGER.warn("Backed up the regionfile to " + to.toAbsolutePath()); + LOGGER.warn("Backed up the regionfile to " + to.toAbsolutePath());
+ } catch (IOException ex) { + } catch (IOException ex) {
+ LOGGER.error("Failed to backup to " + to.toAbsolutePath(), ex); + LOGGER.error("Failed to backup to " + to.toAbsolutePath(), ex);
@@ -473,11 +473,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- long j = Files.size(file); - long j = Files.size(file);
+ final long j = Files.size(file); final long regionFileSize = j; // Paper - recalculate header on header corruption + final long j = Files.size(file); final long regionFileSize = j; // Paper - recalculate header on header corruption
- for (int k = 0; k < 1024; ++k) {
- int l = this.offsets.get(k);
+ boolean needsHeaderRecalc = false; // Paper - recalculate header on header corruption + boolean needsHeaderRecalc = false; // Paper - recalculate header on header corruption
+ boolean hasBackedUp = false; // Paper - recalculate header on header corruption + boolean hasBackedUp = false; // Paper - recalculate header on header corruption
for (int k = 0; k < 1024; ++k) { + for (int k = 0; k < 1024; ++k) { final int headerLocation = k; // Paper - we expect this to be the header location
- int l = this.offsets.get(k); + final int l = this.offsets.get(k);
+ final int l = this.offsets.get(k); final int headerLocation = l; // Paper - we expect this to be the header location
if (l != 0) { if (l != 0) {
- int i1 = RegionFile.getSectorNumber(l); - int i1 = RegionFile.getSectorNumber(l);