Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-09-27 22:18:11 +02:00
Code Issues Projects Releases Wiki Activity

Zones now save and reset to-from disk only. This not giving me the boost I hoped for though. Nuts.

Browse Source
This commit is contained in:
taoneill 2011-06-05 11:06:59 -04:00
parent ab576e09da
commit 7fae2a22ff
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
View File

@ -125,7 +125,7 @@ public class WarEntityListener extends EntityListener {
// Detect death, prevent it and respawn the player
Player d = (Player) defender;
Warzone defenderWarzone = war.getPlayerTeamWarzone(d.getName());
if(event.getDamage() >= d.getHealth()) {
if(d != null && defenderWarzone != null && event.getDamage() >= d.getHealth()) {
defenderWarzone.handleDeath(d);
event.setCancelled(true);
}

2
war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java
View File

@ -433,7 +433,7 @@ public class WarzoneMapper {
if(saveAllBlocks) {
// zone blocks
VolumeMapper.save(warzone.getVolume(), warzone.getName(), war);
//VolumeMapper.save(warzone.getVolume(), warzone.getName(), war);
}
// monument blocks

37
war/src/main/java/com/tommytony/war/mappers/ZoneVolumeMapper.java
View File

@ -67,22 +67,26 @@ public class ZoneVolumeMapper {
DeferredBlockResetsJob deferred = new DeferredBlockResetsJob(world);
int blockReads = 0, visitedBlocks = 0, x = 0, y = 0, z = 0;
int diskBlockType;
byte diskBlockData;
Block worldBlock;
int worldBlockId;
volume.clearBlocksThatDontFloat();
x = volume.getMinX();
for(int i = 0; i < volume.getSizeX(); i++){
x = volume.getMinX();
y = volume.getMinY();
for(int j = 0; j < volume.getSizeY(); j++) {
y = volume.getMinY();
z = volume.getMinZ();
for(int k = 0; k < volume.getSizeZ(); k++) {
z = volume.getMinZ();
try {
String blockLine = in.readLine();
if(blockLine != null && !blockLine.equals("")) {
String[] blockSplit = blockLine.split(",");
if(blockLine != null && !blockLine.equals("") && blockSplit.length > 1) {
int diskBlockType = Integer.parseInt(blockSplit[0]);
byte diskBlockData = Byte.parseByte(blockSplit[1]);
Block worldBlock = volume.getWorld().getBlockAt(x, y, z);
int worldBlockId = worldBlock.getTypeId();
diskBlockType = Integer.parseInt(blockSplit[0]);
diskBlockData = Byte.parseByte(blockSplit[1]);
worldBlock = volume.getWorld().getBlockAt(x, y, z);
worldBlockId = worldBlock.getTypeId();
if(worldBlockId != diskBlockType ||
(worldBlockId == diskBlockType && worldBlock.getData() != diskBlockData ) ||
(worldBlockId == diskBlockType && worldBlock.getData() == diskBlockData &&
@ -315,6 +319,7 @@ public class ZoneVolumeMapper {
if(volume.hasTwoCorners()) {
BufferedWriter out = null;
try {
(new File(war.getDataFolder().getPath() +"/dat/warzone-"+zoneName)).mkdir();
if(zoneName.equals("")) out = new BufferedWriter(new FileWriter(new File(war.getDataFolder().getPath() + "/dat/volume-" + volume.getName() + ".dat")));
else out = new BufferedWriter(new FileWriter(new File(war.getDataFolder().getPath() +
"/dat/warzone-" + zoneName + "/volume-" + volume.getName() + ".dat")));
@ -331,18 +336,22 @@ public class ZoneVolumeMapper {
int x = 0;
int y = 0;
int z = 0;
Block block;
int typeId;
byte data;
BlockState state;
x = volume.getMinX();
for(int i = 0; i < volume.getSizeX(); i++){
x = volume.getMinX();
y = volume.getMinY();
for(int j = 0; j < volume.getSizeY(); j++) {
y = volume.getMinY();
z = volume.getMinZ();
for(int k = 0; k < volume.getSizeZ(); k++) {
z = volume.getMaxZ();
try {
Block block = volume.getWorld().getBlockAt(x, y, z);
int typeId = block.getTypeId();
byte data = block.getData();
BlockState state = block.getState();
block = volume.getWorld().getBlockAt(x, y, z);
typeId = block.getTypeId();
data = block.getData();
state = block.getState();
out.write(typeId + "," + data + ",");

4
war/src/main/java/com/tommytony/war/volumes/ZoneVolume.java
View File

@ -29,7 +29,7 @@ public class ZoneVolume extends Volume {
public int saveBlocks() {
// Save blocks directly to disk (i.e. don't put everything in memory)
int saved = ZoneVolumeMapper.save(this, zone.getName(), this.getWar());
getWar().logInfo("Saved " + saved + " blocks in warzone " + zone.getName() + ".");
isSaved = true;
return saved;
}
@ -43,7 +43,7 @@ public class ZoneVolume extends Volume {
public int resetBlocks() {
// Load blocks directly from disk and onto the map (i.e. no more in-memory warzone blocks)
int reset = ZoneVolumeMapper.load(this, zone.getName(), this.getWar(), this.getWorld());
getWar().logInfo("Reset " + reset + " blocks in warzone " + zone.getName() + ".");
isSaved = true;
return reset;
}