diff --git a/pom.xml b/pom.xml
index 4e58efa86..0a826d3ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,25 +11,21 @@
UTF-8
- 1.1-R4
- 1.1-R4
+ 1.1-R4-SNAPSHOT
+ 1.1-R4-SNAPSHOT
Unknown
-
- craftbukkit-repo
- http://repo.bukkit.org/org/bukkit/craftbukkit/${craftbukkit.version}/craftbukkit-${craftbukkit.version}.jar
-
bukkit-repo
- http://repo.bukkit.org/org/bukkit/bukkit/${bukkit.version}/bukkit-${bukkit.version}.jar
+ http://repo.bukkit.org/content/groups/public/
-
+
+
http://repo.citizensnpcs.net
-
+ -->
diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java
index 6129b4eb4..e8387a492 100644
--- a/src/net/citizensnpcs/Citizens.java
+++ b/src/net/citizensnpcs/Citizens.java
@@ -2,6 +2,7 @@ package net.citizensnpcs;
import java.io.File;
import java.io.IOException;
+import java.sql.SQLException;
import java.util.List;
import java.util.logging.Level;
@@ -164,7 +165,13 @@ public class Citizens extends JavaPlugin {
// NPC storage
if (Setting.USE_DATABASE.asBoolean()) {
- saves = new DatabaseStorage();
+ try {
+ saves = new DatabaseStorage(Setting.DATABASE_DRIVER.asString(), Setting.DATABASE_URL.asString(),
+ Setting.DATABASE_USERNAME.asString(), Setting.DATABASE_PASSWORD.asString());
+ } catch (SQLException e) {
+ Messaging.log("Unable to connect to database, falling back to YAML");
+ saves = new YamlStorage(getDataFolder() + File.separator + "saves.yml", "Citizens NPC Storage");
+ }
} else {
saves = new YamlStorage(getDataFolder() + File.separator + "saves.yml", "Citizens NPC Storage");
}
diff --git a/src/net/citizensnpcs/Settings.java b/src/net/citizensnpcs/Settings.java
index ff84cfe98..ad7597306 100644
--- a/src/net/citizensnpcs/Settings.java
+++ b/src/net/citizensnpcs/Settings.java
@@ -35,7 +35,11 @@ public class Settings {
QUICK_SELECT("npc.selection.quick-select", false),
SELECTION_ITEM("npc.selection.item", 280),
SELECTION_MESSAGE("npc.selection.message", "You selected !"),
- USE_DATABASE("use-database", false);
+ USE_DATABASE("use-database", false),
+ DATABASE_PASSWORD("database.password", ""),
+ DATABASE_USERNAME("database.username", ""),
+ DATABASE_URL("database.url", ""),
+ DATABASE_DRIVER("database.driver", "");
private String path;
private Object value;