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

Correctly log how many prisoners were loaded.

Browse Source
This commit is contained in:
graywolf336
2014-04-28 22:46:41 -05:00
parent 998c7bd824
commit 0981fe659f
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,7 +450,6 @@ public class JailIO {
//that doesn't exist anymore //that doesn't exist anymore
List<String> prisonersToRemove = new LinkedList<String>(); List<String> prisonersToRemove = new LinkedList<String>();
int pc = 0;
try { try {
if(con == null) this.prepareStorage(false); if(con == null) this.prepareStorage(false);
PreparedStatement ps = con.prepareStatement("SELECT * FROM " + prefix + "prisoners"); PreparedStatement ps = con.prepareStatement("SELECT * FROM " + prefix + "prisoners");
@@ -481,8 +480,6 @@ public class JailIO {
//the prisoner is assigned to a cell which doesn't exist, so just put them into the jail //the prisoner is assigned to a cell which doesn't exist, so just put them into the jail
j.addPrisoner(p); j.addPrisoner(p);
} }
pc++;
} else { } else {
//if the jail doesn't exist, do the same as the cells //if the jail doesn't exist, do the same as the cells
prisonersToRemove.add(set.getString("name")); prisonersToRemove.add(set.getString("name"));
@@ -522,8 +519,6 @@ public class JailIO {
} }
} }
pl.getLogger().info("Loaded " + pc + (pc == 1 ? " prisoner." : " prisoners."));
pl.debug("Took " + (System.currentTimeMillis() - st) + " millis."); pl.debug("Took " + (System.currentTimeMillis() - st) + " millis.");
break; break;
default: default:
@@ -541,6 +536,9 @@ public class JailIO {
int js = pl.getJailManager().getJails().size(); int js = pl.getJailManager().getJails().size();
pl.getLogger().info("Loaded " + js + (js == 1 ? " jail." : " jails.")); pl.getLogger().info("Loaded " + js + (js == 1 ? " jail." : " jails."));
int ps = pl.getJailManager().getAllPrisoners().size();
pl.getLogger().info("Loaded " + ps + (ps == 1 ? " prisoner." : " prisoners."));
} }
private void loadJailFromFlatFile(String name) { private void loadJailFromFlatFile(String name) {

15
src/main/java/com/graywolf336/jail/JailManager.java
View File

@@ -154,6 +154,21 @@ public class JailManager {
return this.jails.get(name) != null; return this.jails.get(name) != null;
} }
/**
* Gets all the prisoners in the system, best for a system wide count of the prisoners or accessing all the prisoners at once.
*
* @return HashSet of Prisoners.
*/
public HashSet<Prisoner> getAllPrisoners() {
HashSet<Prisoner> prisoners = new HashSet<Prisoner>();
for(Jail j : jails.values()) {
prisoners.addAll(j.getAllPrisoners());
}
return prisoners;
}
/** /**
* Gets the {@link Jail jail} the given prisoner is in. * Gets the {@link Jail jail} the given prisoner is in.
* *