Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #189 from mikeprimm/master

Browse Source 
Fix hash index calculation - kzed tile coords inconsistent with map
This commit is contained in:
mikeprimm 2011-06-01 17:33:04 -07:00
commit 60d1a59d45
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
View File

@ -235,7 +235,9 @@ public class DefaultTileRenderer implements MapTileRenderer {
TileHashManager hashman = MapManager.mapman.hashman; TileHashManager hashman = MapManager.mapman.hashman;
long crc = hashman.calculateTileHash(img.argb_buf); long crc = hashman.calculateTileHash(img.argb_buf);
boolean updated_fname = false; boolean updated_fname = false;
if((!fname.exists()) || (crc != hashman.getImageHashCode(mtile.getKey(), null, mtile.px, mtile.py))) { int tx = mtile.px/KzedMap.tileWidth;
int ty = mtile.py/KzedMap.tileHeight;
if((!fname.exists()) || (crc != hashman.getImageHashCode(mtile.getKey(), null, tx, ty))) {
Debug.debug("saving image " + fname.getPath()); Debug.debug("saving image " + fname.getPath());
try { try {
ImageIO.write(img.buf_img, "png", fname); ImageIO.write(img.buf_img, "png", fname);
@ -245,7 +247,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
Debug.error("Failed to save image (NullPointerException): " + fname.getPath(), e); Debug.error("Failed to save image (NullPointerException): " + fname.getPath(), e);
} }
MapManager.mapman.pushUpdate(mtile.getWorld(), new Client.Tile(mtile.getFilename())); MapManager.mapman.pushUpdate(mtile.getWorld(), new Client.Tile(mtile.getFilename()));
hashman.updateHashCode(mtile.getKey(), null, mtile.px, mtile.py, crc); hashman.updateHashCode(mtile.getKey(), null, tx, ty, crc);
updated_fname = true; updated_fname = true;
} }
KzedMap.freeBufferedImage(img); KzedMap.freeBufferedImage(img);
@ -259,7 +261,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
if(img_day != null) { if(img_day != null) {
FileLockManager.getWriteLock(dfname); FileLockManager.getWriteLock(dfname);
crc = hashman.calculateTileHash(img.argb_buf); crc = hashman.calculateTileHash(img.argb_buf);
if((!dfname.exists()) || (crc != hashman.getImageHashCode(mtile.getKey(), "day", mtile.px, mtile.py))) { if((!dfname.exists()) || (crc != hashman.getImageHashCode(mtile.getKey(), "day", tx, ty))) {
Debug.debug("saving image " + dfname.getPath()); Debug.debug("saving image " + dfname.getPath());
try { try {
ImageIO.write(img_day.buf_img, "png", dfname); ImageIO.write(img_day.buf_img, "png", dfname);
@ -269,7 +271,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
Debug.error("Failed to save image (NullPointerException): " + dfname.getPath(), e); Debug.error("Failed to save image (NullPointerException): " + dfname.getPath(), e);
} }
MapManager.mapman.pushUpdate(mtile.getWorld(), new Client.Tile(mtile.getDayFilename())); MapManager.mapman.pushUpdate(mtile.getWorld(), new Client.Tile(mtile.getDayFilename()));
hashman.updateHashCode(mtile.getKey(), "day", mtile.px, mtile.py, crc); hashman.updateHashCode(mtile.getKey(), "day", tx, ty, crc);
updated_dfname = true; updated_dfname = true;
} }
KzedMap.freeBufferedImage(img_day); KzedMap.freeBufferedImage(img_day);