Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-01-05 07:17:34 +01:00
Code Issues Projects Releases Wiki Activity

Now handling negative block types

Browse Source 
Closes gh-530. Weirdly, it seems that some new blocks (e.g. emerald
block) get saved with negative block type ids. For the time being, the
absolute value of the negative type id is used instead. The console spam
should be lessened as well - leading to less crashes. Still gotta find
the reason for the weird block ids, though.
This commit is contained in:
taoneill 2012-08-14 19:29:12 -04:00
parent 00af397929
commit 39a8becdfe
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
war/src/main/java/com/tommytony/war/mapper/ZoneVolumeMapper.java
View File

@ -56,6 +56,7 @@ public class ZoneVolumeMapper {
File signsFile = new File(War.war.getDataFolder().getPath() + "/dat/warzone-" + zoneName + "/volume-" + volume.getName() + ".signs");
File invsFile = new File(War.war.getDataFolder().getPath() + "/dat/warzone-" + zoneName + "/volume-" + volume.getName() + ".invs");
int noOfResetBlocks = 0;
boolean failed = false;
if (!blocksFile.exists()) {
// The post 1.6 formatted files haven't been created yet so
// we need to use the old load.
@ -205,9 +206,14 @@ public class ZoneVolumeMapper {
deferred.add(new DeferredBlockReset(x, y, z, diskBlockType, diskBlockData));
} else {
// regular block
if(diskBlockType >-1){
worldBlock.setType(Material.getMaterial(diskBlockType))
worldBlock.setData(diskBlockData);
if (diskBlockType >= 0) {
worldBlock.setType(Material.getMaterial(diskBlockType));
worldBlock.setData(diskBlockData);
} else {
War.war.getLogger().warning("Bad block type:" + diskBlockType + " data:" + diskBlockData + " at x:" + x + " y:" + y + " z:" + z);
worldBlock.setType(Material.getMaterial(Math.abs(diskBlockType)));
worldBlock.setData(diskBlockData);
}
}
noOfResetBlocks++;
}
@ -216,8 +222,12 @@ public class ZoneVolumeMapper {
blockReads++;
} catch (Exception e) {
War.war.getLogger().warning("Failed to reset block in zone volume " + volume.getName() + ". " + "Blocks read: " + blockReads + ". Visited blocks so far:" + visitedBlocks + ". Blocks reset: " + noOfResetBlocks + ". Error at x:" + x + " y:" + y + " z:" + z + ". Exception:" + e.getClass().toString() + " " + e.getMessage());
e.printStackTrace();
if (!failed) {
// Don't spam the console
War.war.getLogger().warning("Failed to reset block in zone volume " + volume.getName() + ". " + "Blocks read: " + blockReads + ". Visited blocks so far:" + visitedBlocks + ". Blocks reset: " + noOfResetBlocks + ". Error at x:" + x + " y:" + y + " z:" + z + ". Exception:" + e.getClass().toString() + " " + e.getMessage());
e.printStackTrace();
failed = true;
}
} finally {
z++;
}