EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Don't resave cells on stopping creation, fixes #74

Browse Source 
We was saving everything again when the players stop creating anything,
this was causing issues with duplicate cells when using any storage with
SQL (due to insert and no primary key).

Also, added a hasChanged to the cell class which will prevent resaving
things in sql if it hasn't changed.
This commit is contained in:
graywolf336 2015-05-26 14:57:38 -05:00
parent fd52be6972
commit 12f35a01bf
7 changed files with 75 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/graywolf336/jail/JailIO.java
View File

@ -449,8 +449,16 @@ public class JailIO {
c.addSign(new SimpleLocation(co[0], co[1], co[2], co[3]));
}
}
//Since we're loading the data, the cell hasn't officially changed
c.setChanged(false);
j.addCell(c, false);
//Try to add the cell to the jail, if one
if(!j.addCell(c, false)) {
int id = set.getInt("cellid");
cellsToRemove.add(id);
pl.debug("The cell, " + c.getName() + " (" + id + "), is already in jail " + j.getName() + " so we're removing it.");
}
}else {
pl.getLogger().warning("The cell, " + set.getString("name") + ", in " + j.getName() + " is located in a world that is not loaded.");
}
@ -471,24 +479,24 @@ public class JailIO {
//Remove the invalid prisoners
if(cellsToRemove.size() != 0) {
String names = "";
StringBuilder ids = new StringBuilder();
for(int c : cellsToRemove) {
if(names.isEmpty()) names = "'" + c + "'";
else names += "," + "'" + c + "'";
if(ids.length() == 0) ids.append("'" + c + "'");
else ids.append("," + "'" + c + "'");
}
try {
PreparedStatement cds = getConnection().prepareStatement("delete from " + prefix + "cells where cellid in (" + names + ");");
PreparedStatement cds = getConnection().prepareStatement("delete from " + prefix + "cells where cellid in (" + ids.toString() + ");");
pl.debug("Deleting old cells: 'delete from " + prefix + "cells where cellid in (" + names + ");'");
pl.debug("Deleting old cells: `delete from " + prefix + "cells where cellid in (" + ids.toString() + ");`");
int count = cds.executeUpdate();
pl.getLogger().info("Deleted " + count + " old cells which referenced a jail no longer valid: " + names);
pl.getLogger().info("Deleted " + count + " cells which were invalid, they either referenced a jail which are no longer valid or were duplicates.");
cds.close();
} catch (SQLException e) {
e.printStackTrace();
pl.getLogger().severe("---------- Jail Error!!! ----------");
pl.getLogger().severe("Error while deleting the old cells which don't have a valid jail, please check the error and fix what is wrong.");
pl.getLogger().severe("Error while deleting the old cells which were invalid (they either referenced a jail which are no longer valid or were duplicates), please check the error and fix what is wrong.");
}
}
@ -521,6 +529,7 @@ public class JailIO {
j.addPrisoner(p);
}else if(c != null) {
c.setPrisoner(p);
c.setChanged(false);
}else {
//the prisoner is assigned to a cell which doesn't exist, so just put them into the jail
j.addPrisoner(p);
@ -664,6 +673,7 @@ public class JailIO {
c.setPrisoner(p);
}
c.setChanged(false);
j.addCell(c, false);
}
}
@ -904,6 +914,8 @@ public class JailIO {
if(p.getPreviousGameMode() != null)
flat.set(cNode + "prisoner.previousGameMode", p.getPreviousGameMode().toString());
}
c.setChanged(false);
}
//Null all the prisoners out before we save them again, this way no prisoners are left behind
@ -939,10 +951,14 @@ public class JailIO {
}
public void saveCell(Jail j, Cell c) {
//if the cell hasn't changed, no need to save it again
if(!c.hasChanged()) return;
switch(storage) {
case 1:
case 2:
try {
pl.debug("Saving the cell " + c.getName());
PreparedStatement cPS = getConnection().prepareStatement("INSERT INTO `" + prefix + "cells` (`name`, `jail`, `tp.x`, `tp.y`, `tp.z`, `tp.yaw`,"
+ "`tp.pitch`, `chest.x`, `chest.y`, `chest.z`, `signs`) VALUES (?,?,?,?,?,?,?,?,?,?,?)");
@ -1002,6 +1018,8 @@ public class JailIO {
this.saveJail(j);
break;
}
c.setChanged(false);
}
/**

8
src/main/java/com/graywolf336/jail/beans/AnyCell.java
View File

@ -71,4 +71,12 @@ public class AnyCell implements ICell {
public boolean hasChest() {
throw new UnsupportedOperationException();
}
public boolean setChanged(boolean changed) {
throw new UnsupportedOperationException();
}
public boolean hasChanged() {
throw new UnsupportedOperationException();
}
}

16
src/main/java/com/graywolf336/jail/beans/Cell.java
View File

@ -20,6 +20,7 @@ public class Cell implements ICell {
private Prisoner p;
private HashSet<SimpleLocation> signs;
private SimpleLocation teleport, chest;
private boolean changed;
/** Creates a new Cell with the given name
*
@ -28,6 +29,7 @@ public class Cell implements ICell {
public Cell(String name) {
this.name = name;
this.signs = new HashSet<SimpleLocation>();
this.changed = false;
}
public String getName() {
@ -36,6 +38,7 @@ public class Cell implements ICell {
public void setPrisoner(Prisoner prisoner) {
this.p = prisoner;
this.changed = true;
}
public Prisoner getPrisoner() {
@ -44,6 +47,7 @@ public class Cell implements ICell {
public void removePrisoner() {
this.p = null;
this.changed = true;
}
public boolean hasPrisoner() {
@ -52,10 +56,12 @@ public class Cell implements ICell {
public void addAllSigns(HashSet<SimpleLocation> signs) {
this.signs.addAll(signs);
this.changed = true;
}
public void addSign(SimpleLocation sign) {
this.signs.add(sign);
this.changed = true;
}
public HashSet<SimpleLocation> getSigns() {
@ -82,6 +88,7 @@ public class Cell implements ICell {
public void setTeleport(SimpleLocation location) {
this.teleport = location;
this.changed = true;
}
public Location getTeleport() {
@ -90,6 +97,7 @@ public class Cell implements ICell {
public void setChestLocation(SimpleLocation simpleLocation) {
this.chest = simpleLocation;
this.changed = true;
}
public Location getChestLocation() {
@ -115,4 +123,12 @@ public class Cell implements ICell {
}else
return false;
}
public boolean setChanged(boolean changed) {
return this.changed = changed;
}
public boolean hasChanged() {
return this.changed;
}
}

8
src/main/java/com/graywolf336/jail/beans/Jail.java
View File

@ -160,9 +160,13 @@ public class Jail {
}
/** Adds a cell to the Jail. */
public void addCell(Cell cell, boolean save) {
public boolean addCell(Cell cell, boolean save) {
if(save) plugin.getJailIO().saveCell(this, cell);
this.cells.put(cell.getName(), cell);
//Check if it already exists or not
if(this.cells.containsKey(cell.getName())) return false;
else this.cells.put(cell.getName(), cell);
return true;
}
/** Gets the cell with the given name. */

8
src/main/java/com/graywolf336/jail/beans/NoCell.java
View File

@ -71,4 +71,12 @@ public class NoCell implements ICell {
public boolean hasChest() {
throw new UnsupportedOperationException();
}
public boolean setChanged(boolean changed) {
throw new UnsupportedOperationException();
}
public boolean hasChanged() {
throw new UnsupportedOperationException();
}
}

2
src/main/java/com/graywolf336/jail/command/subcommands/JailStopCommand.java
View File

@ -33,8 +33,6 @@ public class JailStopCommand implements Command {
if(nothing) {
sender.sendMessage(ChatColor.RED + "You've stopped creating....nothing.");
}else {
jm.getPlugin().getJailIO().saveEverything();
}
return true;

11
src/main/java/com/graywolf336/jail/interfaces/ICell.java
View File

@ -68,4 +68,15 @@ public interface ICell {
* @return true if there is a chest, false if there isn't.
*/
public boolean hasChest();
/**
* Sets whether this cell has been changed or not.
*
* @param changed true if we've changed it, mostly use if you want to force an update
* @return the resulting change, whether it is changed or not
*/
public boolean setChanged(boolean changed);
/** Gets whether the Cell has changed from the last save or not. */
public boolean hasChanged();
}