Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Do not cast y to byte in history database (#1978)

Browse Source 
- y is/was already stored as an int
 - Fixes #1931
This commit is contained in:
Jordan 2022-10-13 18:20:17 +01:00 committed by GitHub
parent 13eb1f815f
commit ccb31c0ecc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
worldedit-core/src/main/java/com/fastasyncworldedit/core/database/RollbackDatabase.java
View File

@ -111,8 +111,9 @@ public class RollbackDatabase extends AsyncNotifyQueue {
int index = result.getInt("id"); int index = result.getInt("id");
int x1 = result.getInt("x1"); int x1 = result.getInt("x1");
int x2 = result.getInt("x2"); int x2 = result.getInt("x2");
int y1 = result.getByte("y1") + 128; // Keep 128 offset for backwards-compatibility
int y2 = result.getByte("y2") + 128; int y1 = result.getInt("y1") + 128;
int y2 = result.getInt("y2") + 128;
int z1 = result.getInt("z1"); int z1 = result.getInt("z1");
int z2 = result.getInt("z2"); int z2 = result.getInt("z2");
CuboidRegion region = new CuboidRegion(BlockVector3.at(x1, y1, z1), BlockVector3.at(x2, y2, z2)); CuboidRegion region = new CuboidRegion(BlockVector3.at(x1, y1, z1), BlockVector3.at(x2, y2, z2));
@ -172,8 +173,9 @@ public class RollbackDatabase extends AsyncNotifyQueue {
stmt.setInt(3, pos2.getBlockX()); stmt.setInt(3, pos2.getBlockX());
stmt.setInt(4, pos1.getBlockZ()); stmt.setInt(4, pos1.getBlockZ());
stmt.setInt(5, pos2.getBlockZ()); stmt.setInt(5, pos2.getBlockZ());
stmt.setByte(6, (byte) (pos1.getBlockY() - 128)); // Keep 128 offset for backwards-compatibility
stmt.setByte(7, (byte) (pos2.getBlockY() - 128)); stmt.setInt(6, pos1.getBlockY() - 128);
stmt.setInt(7, pos2.getBlockY() - 128);
if (uuid != null) { if (uuid != null) {
byte[] uuidBytes = toBytes(uuid); byte[] uuidBytes = toBytes(uuid);
stmt.setBytes(8, uuidBytes); stmt.setBytes(8, uuidBytes);
@ -196,8 +198,9 @@ public class RollbackDatabase extends AsyncNotifyQueue {
stmt.setInt(3, pos2.getBlockX()); stmt.setInt(3, pos2.getBlockX());
stmt.setInt(4, pos1.getBlockZ()); stmt.setInt(4, pos1.getBlockZ());
stmt.setInt(5, pos2.getBlockZ()); stmt.setInt(5, pos2.getBlockZ());
stmt.setByte(6, (byte) (pos1.getBlockY() - 128)); // Keep 128 offset for backwards-compatibility
stmt.setByte(7, (byte) (pos2.getBlockY() - 128)); stmt.setInt(6, pos1.getBlockY() - 128);
stmt.setInt(7, pos2.getBlockY() - 128);
byte[] uuidBytes = ByteBuffer byte[] uuidBytes = ByteBuffer
.allocate(16) .allocate(16)
.putLong(uuid.getMostSignificantBits()) .putLong(uuid.getMostSignificantBits())
@ -253,8 +256,9 @@ public class RollbackDatabase extends AsyncNotifyQueue {
stmt.setInt(5, pos2.getX()); stmt.setInt(5, pos2.getX());
stmt.setInt(6, pos1.getZ()); stmt.setInt(6, pos1.getZ());
stmt.setInt(7, pos2.getZ()); stmt.setInt(7, pos2.getZ());
stmt.setByte(8, (byte) (pos1.getY() - 128)); // Keep 128 offset for backwards-compatibility
stmt.setByte(9, (byte) (pos2.getY() - 128)); stmt.setInt(8, pos1.getY() - 128);
stmt.setInt(9, pos2.getY() - 128);
stmt.setString(10, change.getCommand()); stmt.setString(10, change.getCommand());
stmt.setInt(11, change.size()); stmt.setInt(11, change.size());
stmt.executeUpdate(); stmt.executeUpdate();