Upstream
/
war
mirror of https://github.com/taoneill/war.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #531 from MegaMinerJon/patch-1 

Fix for (some of) the map reset crashes. Thanks @MegaMinerJon.
This commit is contained in:
taoneill 2012-08-13 19:04:54 -07:00
parent cd47e28e9f f14d21a35f
commit 00af397929
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,8 @@ public class ZoneVolumeMapper {
deferred.add(new DeferredBlockReset(x, y, z, diskBlockType, diskBlockData)); deferred.add(new DeferredBlockReset(x, y, z, diskBlockType, diskBlockData));
} else { } else {
// regular block // regular block
worldBlock.setType(Material.getMaterial(diskBlockType)); if(diskBlockType >-1){
worldBlock.setType(Material.getMaterial(diskBlockType))
worldBlock.setData(diskBlockData); worldBlock.setData(diskBlockData);
} }
noOfResetBlocks++; noOfResetBlocks++;