Merge branch 'master' of https://github.com/LogBlock/LogBlock into itemdata-expansion

Conflicts:
	src/main/resources/plugin.yml
This commit is contained in:
Philip Cass
2013-12-05 08:40:42 +00:00
2 changed files with 3 additions and 3 deletions
@@ -168,7 +168,7 @@ class Updater
final Statement st = conn.createStatement();
for (final WorldConfig wcfg : getLoggedWorlds())
if (wcfg.isLogging(Logging.KILL))
st.execute("ALTER TABLE `" + wcfg.table + "-kills` ADD (x SMALLINT NOT NULL DEFAULT 0, y TINYINT UNSIGNED NOT NULL DEFAULT 0, z SMALLINT NOT NULL DEFAULT 0)");
st.execute("ALTER TABLE `" + wcfg.table + "-kills` ADD (x MEDIUMINT NOT NULL DEFAULT 0, y SMALLINT NOT NULL DEFAULT 0, z MEDIUMINT NOT NULL DEFAULT 0)");
st.close();
conn.close();
} catch (final SQLException ex) {