Restored compatability with RB of Bukkit.

tgxn · Sep 28, 2011 · 0009e5f · 0009e5f · tgxn · Sep 28, 2011
1 parent 8e23709
commit 0009e5f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/plugin.yml b/src/plugin.yml
@@ -1,5 +1,5 @@
 name: Backup
-version: 1.8.1-dev
+version: 1.7.2-dev
 description: CraftBukkit server Backup plugin.
 authors: [Meldanor, gamerx]
 main: backup.Main

diff --git a/src/res/properties.yml b/src/res/properties.yml
@@ -53,4 +53,4 @@ singlebackup: true
 ##   Internal Settings (Read: DO NOT EDIT)   ##
 ###############################################
 
-version: 1.8.1-dev
+version: 1.7.2-dev
diff --git a/src/threading/BackupTask.java b/src/threading/BackupTask.java
@@ -18,6 +18,7 @@
 
 package threading;
 
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.plugin.Plugin;
 import backup.Strings;
 import java.io.FileNotFoundException;
@@ -235,7 +236,7 @@ private void finish() {
             @Override
             public void run () {
                 if (properties.getBooleanProp("enableautosave"))
-                    server.dispatchCommand(server.getConsoleSender(), "save-on");
+                    server.dispatchCommand(new ConsoleCommandSender(server), "save-on");
                 String completedBackupMessage = strings.getString("backupfinished");
                 if (completedBackupMessage != null && !completedBackupMessage.trim().isEmpty()) {
                     server.broadcastMessage(completedBackupMessage);

diff --git a/src/threading/PrepareBackupTask.java b/src/threading/PrepareBackupTask.java
@@ -20,6 +20,7 @@
 
 import backup.Properties;
 import backup.Strings;
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.LinkedList;
 import org.bukkit.Server;
@@ -75,9 +76,15 @@ protected void prepareBackup() {
         if (startBackupMessage != null && !startBackupMessage.trim().isEmpty()) {
             server.broadcastMessage(startBackupMessage);
         }
-
+
+        ConsoleCommandSender ccs;
+        // Compatible with dev build (more than 857)
+            //ccs = server.getConsoleSender();
+
+        // Compatable with RB. (less than 857)
+            ccs = new ConsoleCommandSender(server);
+
         // Save to file, and then turn saving off.
-        ConsoleCommandSender ccs = server.getConsoleSender();
         server.dispatchCommand(ccs, "save-all");
         server.dispatchCommand(ccs, "save-off");
 
@@ -122,6 +129,7 @@ private String[] getToIgnoreWorlds () {
         }
         return worldNames;
     }
+
 
     public void setBackupName (String backupName) {
         this.backupName = backupName;