Upstream/WorldBorder-Updated-Fork
1
0
Fork 0
mirror of https://github.com/PryPurity/WorldBorder.git synced 2024-11-24 11:55:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Commented out paperlib till I find a fix.

Browse Source
This commit is contained in:
PryPurity 2020-06-25 14:03:08 -05:00
parent 74cc881077
commit cfb818c31b
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.wimbli.WorldBorder</groupId>
<artifactId>WorldBorder</artifactId>
<version>2.0.4</version>
<version>2.0.5</version>
<name>WorldBorder</name>
<url>https://github.com/PryPurity/WorldBorder</url>
<issueManagement>

82
src/main/java/com/wimbli/WorldBorder/WorldFileData.java
View File

@ -6,9 +6,9 @@ import org.bukkit.entity.Player;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*;
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.util.List;
import java.util.*;
@ -155,44 +155,44 @@ public class WorldFileData {
data.add(Boolean.FALSE);
}
for (int i = 0; i < regionFiles.length; i++) {
CoordXZ coord = regionFileCoordinates(i);
// is this region file the one we're looking for?
if (!coord.equals(region))
continue;
try {
RandomAccessFile regionData = new RandomAccessFile(this.regionFile(i), "r");
// Use of ByteBuffer+IntBuffer for reading file headers to improve performance, as suggested by aikar, reference:
// https://github.com/PaperMC/Paper/blob/b62dfa0bf95ac27ba0fbb3fae18c064e4bb61d50/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch
ByteBuffer header = ByteBuffer.allocate(8192);
while (header.hasRemaining()) {
if (regionData.getChannel().read(header) == -1)
throw new EOFException();
}
header.clear();
IntBuffer headerAsInts = header.asIntBuffer();
// first 4096 bytes of region file consists of 4-byte int pointers to chunk data in the file (32*32 chunks = 1024; 1024 chunks * 4 bytes each = 4096)
for (int j = 0; j < 1024; j++) {
// if chunk pointer data is 0, chunk doesn't exist yet; otherwise, it does
if (headerAsInts.get() != 0)
data.set(j, true);
}
// Read timestamps
for (int j = 0; j < 1024; j++) {
// if timestamp is zero, it is protochunk (ignore it)
if ((headerAsInts.get() == 0) && data.get(j))
data.set(j, false);
}
regionData.close();
} catch (FileNotFoundException ex) {
sendMessage("Error! Could not open region file to find generated chunks: " + this.regionFile(i).getName());
} catch (IOException ex) {
sendMessage("Error! Could not read region file to find generated chunks: " + this.regionFile(i).getName());
}
}
//for (int i = 0; i < regionFiles.length; i++) {
// CoordXZ coord = regionFileCoordinates(i);
// // is this region file the one we're looking for?
// if (!coord.equals(region))
// continue;
//
// try {
// RandomAccessFile regionData = new RandomAccessFile(this.regionFile(i), "r");
//
// // Use of ByteBuffer+IntBuffer for reading file headers to improve performance, as suggested by aikar, reference:
// // https://github.com/PaperMC/Paper/blob/b62dfa0bf95ac27ba0fbb3fae18c064e4bb61d50/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch
// ByteBuffer header = ByteBuffer.allocate(8192);
// while (header.hasRemaining()) {
// if (regionData.getChannel().read(header) == -1)
// throw new EOFException();
// }
// header.clear();
// IntBuffer headerAsInts = header.asIntBuffer();
//
// // first 4096 bytes of region file consists of 4-byte int pointers to chunk data in the file (32*32 chunks = 1024; 1024 chunks * 4 bytes each = 4096)
// for (int j = 0; j < 1024; j++) {
// // if chunk pointer data is 0, chunk doesn't exist yet; otherwise, it does
// if (headerAsInts.get() != 0)
// data.set(j, true);
// }
// // Read timestamps
// for (int j = 0; j < 1024; j++) {
// // if timestamp is zero, it is protochunk (ignore it)
// if ((headerAsInts.get() == 0) && data.get(j))
// data.set(j, false);
// }
// regionData.close();
// } catch (FileNotFoundException ex) {
// sendMessage("Error! Could not open region file to find generated chunks: " + this.regionFile(i).getName());
// } catch (IOException ex) {
// sendMessage("Error! Could not read region file to find generated chunks: " + this.regionFile(i).getName());
// }
//}
regionChunkExistence.put(region, data);
// testImage(region, data);
return data;

2
src/main/resources/plugin.yml
View File

@ -1,7 +1,7 @@
name: WorldBorder
authors: [Brettflan, PryPurity]
description: Efficient, feature-rich plugin for limiting the size of your worlds.
version: 2.0.4
version: 2.0.5
api-version: 1.13
main: com.wimbli.WorldBorder.WorldBorder
softdepend: