EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-10-31 17:23:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix a duping bug that uses a coordinate error. Fixes #2979 and fixes #3429.

Browse Source
This commit is contained in:
Glitchfinder
2018-04-15 10:19:31 -07:00
parent 6876f192de
commit be2de1d487
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java
View File

@@ -184,9 +184,10 @@ public class HashChunkletManager implements ChunkletManager {
@Override @Override
public boolean isTrue(int x, int y, int z, World world) { public boolean isTrue(int x, int y, int z, World world) {
int cx = x / 16; int cx = x >> 4;
int cz = z / 16; int cz = z >> 4;
int cy = y / 64; int cy = y >> 6;
String key = world.getName() + "," + cx + "," + cz + "," + cy; String key = world.getName() + "," + cx + "," + cz + "," + cy;
if (!store.containsKey(key)) { if (!store.containsKey(key)) {
@@ -212,9 +213,9 @@ public class HashChunkletManager implements ChunkletManager {
@Override @Override
public void setTrue(int x, int y, int z, World world) { public void setTrue(int x, int y, int z, World world) {
int cx = x / 16; int cx = x >> 4;
int cz = z / 16; int cz = z >> 4;
int cy = y / 64; int cy = y >> 6;
int ix = Math.abs(x) % 16; int ix = Math.abs(x) % 16;
int iz = Math.abs(z) % 16; int iz = Math.abs(z) % 16;
@@ -244,9 +245,9 @@ public class HashChunkletManager implements ChunkletManager {
@Override @Override
public void setFalse(int x, int y, int z, World world) { public void setFalse(int x, int y, int z, World world) {
int cx = x / 16; int cx = x >> 4;
int cz = z / 16; int cz = z >> 4;
int cy = y / 64; int cy = y >> 6;
int ix = Math.abs(x) % 16; int ix = Math.abs(x) % 16;
int iz = Math.abs(z) % 16; int iz = Math.abs(z) % 16;

13
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java
View File

@@ -293,8 +293,9 @@ public class HashChunkManager implements ChunkManager {
return false; return false;
} }
int cx = x / 16; int cx = x >> 4;
int cz = z / 16; int cz = z >> 4;
String key = world.getName() + "," + cx + "," + cz; String key = world.getName() + "," + cx + "," + cz;
if (!store.containsKey(key)) { if (!store.containsKey(key)) {
@@ -336,8 +337,8 @@ public class HashChunkManager implements ChunkManager {
return; return;
} }
int cx = x / 16; int cx = x >> 4;
int cz = z / 16; int cz = z >> 4;
int ix = Math.abs(x) % 16; int ix = Math.abs(x) % 16;
int iz = Math.abs(z) % 16; int iz = Math.abs(z) % 16;
@@ -382,8 +383,8 @@ public class HashChunkManager implements ChunkManager {
return; return;
} }
int cx = x / 16; int cx = x >> 4;
int cz = z / 16; int cz = z >> 4;
int ix = Math.abs(x) % 16; int ix = Math.abs(x) % 16;
int iz = Math.abs(z) % 16; int iz = Math.abs(z) % 16;