1.1: fixed some stuff in hellhounds, idk what else. little bug fixes.

src/config.yml

@@ -56,7 +56,7 @@
 # points:
 #   list-world-only - whether or not to list points in the current world only, or in all [default: false]
 
-version: 1.0
+version: 1.1.0
 override: true
 debug: false
 metrics-enabled: true
@@ -73,7 +73,7 @@ login-handler: default
 whitelist-handler: default
 database:
     driver: org.sqlite.JDBC
-    url: jdbc:sqlite:{DIR}{NAME}.db
+    url: jdbc:sqlite:{DIR}/{NAME}.db
     username: captain
     password: narwhals
     isolation: SERIALIZABLE
@@ -105,6 +105,4 @@ actions:
         golem-cruelty: false
     hounds:
         attack-delay: 60
-        removal-delay: 600
-points:
-    list-world-only: false
+        removal-delay: 600

src/data.yml

@@ -1,8 +1,6 @@
 # this file is not meant for configuration by the end user, this is meant for storage and usage by the plugin itself
+# this file will be gone VERY SOON once I get bans serialised in the database.
 
 ban_storage:
     ip: {}
-    name: {}
-whitelist: []
-credentials: {}
-locations: {}
+    name: {}

src/me/maiome/openauth/actions/Actions.java

@@ -142,7 +142,7 @@ public static void loadMetricsData() {
         for (Actions a : Actions.values()) {
             try {
                 Class action = a.getAction();
-                Tracker metric = action.getField("tracker").get(action);
+                Tracker metric = (Tracker) action.getField("tracker").get(action);
                 OpenAuth.getMetrics().addCustomData(metric);
                 log.exDebug(String.format("Registered Metrics data tracker [%s] from %s.", metric.getColumnName(), action.getCanonicalName()));
             } catch (java.lang.Exception e) {

src/me/maiome/openauth/actions/HellHounds.java

@@ -79,7 +79,7 @@ public void run() {
                 world.strikeLightningEffect(block.getLocation());
                 Wolf w = world.spawn(block.getLocation(), Wolf.class);
                 spawned.add(w);
-                w.damage(0, (Entity) target);
+                w.damage(0, (Entity) target.getPlayer());
                 w.setNoDamageTicks((int) removal_delay);
                 w.setFireTicks((int) removal_delay);
                 w.setAngry(true);
@@ -184,12 +184,12 @@ public void run(Block block) {}
 
     // player attack method
     public void run(OAPlayer player) {
-        tracker.increment();
         if (attacking.contains(player)) {
             this.sender.sendMessage(ChatColor.BLUE + String.format("Player %s is already being attacked.", player.getName()));
             this.used = false;
             return;
         }
+        tracker.increment();
         this.target = player;
         attacking.add(player);
         this.storming = player.getLocation().getWorld().hasStorm();

src/me/maiome/openauth/commands/OACommands.java

@@ -156,7 +156,9 @@ public static void wand(CommandContext args, CommandSender sender) throws Comman
     @Command(aliases = {"save"}, usage = "", desc = "Saves the data configuration.", max = 0)
     @CommandPermissions({ "openauth.admin.save" })
     public static void savedata(CommandContext args, CommandSender sender) throws CommandException {
+        OpenAuth.getOAServer().saveBans(false);
         ConfigInventory.DATA.save();
+        OpenAuth.getOAServer().getWhitelistHandler().saveWhitelist();
         sender.sendMessage(ChatColor.GREEN + "OpenAuth data has been saved.");
     }