From 7a03eeca1b539ed636f2bea8c44c88ecc05d40df Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Tue, 11 Oct 2011 12:48:44 +0200
Subject: Changes for new Bukkit

---
 .../src/com/earth2me/essentials/OfflinePlayer.java    | 19 +++++++++++++++++++
 .../src/com/earth2me/essentials/PlayerWrapper.java    | 18 ++++++++++++++++++
 .../src/org/anjocaido/groupmanager/GroupManager.java  |  4 ++--
 .../groupmanager/dataholder/worlds/WorldsHolder.java  |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index 1b0058f24..3ca0c17f4 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -3,6 +3,7 @@ package com.earth2me.essentials;
 import java.net.InetSocketAddress;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import org.bukkit.Achievement;
@@ -725,4 +726,22 @@ public class OfflinePlayer implements Player
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	@Override
+	public int getTicksLived()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setTicksLived(int i)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Map<String, Object> serialize()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
index 4b998af47..ccb61d891 100644
--- a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
+++ b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
@@ -755,5 +755,23 @@ public class PlayerWrapper implements Player
 	{
 		return base.getPlayerListName();
 	}
+
+	@Override
+	public int getTicksLived()
+	{
+		return base.getTicksLived();
+	}
+
+	@Override
+	public void setTicksLived(int i)
+	{
+		base.setTicksLived(i);
+	}
+
+	@Override
+	public Map<String, Object> serialize()
+	{
+		return base.serialize();
+	}
 	
 }
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 0fe8a15d4..23cd1e9b5 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -159,7 +159,7 @@ public class GroupManager extends JavaPlugin {
                 }
             };
             scheduler = new ScheduledThreadPoolExecutor(1);
-            int minutes = getConfig().getSaveInterval();
+            int minutes = getGMConfig().getSaveInterval();
             scheduler.scheduleAtFixedRate(commiter, minutes, minutes, TimeUnit.MINUTES);
             GroupManager.logger.info("Scheduled Data Saving is set for every " + minutes + " minutes!");
         }
@@ -1749,7 +1749,7 @@ public class GroupManager extends JavaPlugin {
     /**
      * @return the config
      */
-    public GMConfiguration getConfig() {
+    public GMConfiguration getGMConfig() {
         return config;
     }
 
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
index 50e6ef547..0bcf9a827 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
@@ -111,7 +111,7 @@ public class WorldsHolder {
     @SuppressWarnings("rawtypes")
     public void mirrorSetUp() {
         mirrors.clear();
-        Map<String, Object> mirrorsMap = plugin.getConfig().getMirrorsMap();
+        Map<String, Object> mirrorsMap = plugin.getGMConfig().getMirrorsMap();
         if (mirrorsMap != null) {
             for (String source : mirrorsMap.keySet()) {
             	// Make sure all non mirrored worlds have a set of data files.
-- 
cgit v1.2.3