From 95ee1d731cfdbf4c1378c47c6dfb46bd60186d5c Mon Sep 17 00:00:00 2001
From: Eric Stokes <fernferret@gmail.com>
Date: Mon, 22 Oct 2012 17:22:33 -0600
Subject: [PATCH] Fix merge error, Add correct dependency versions

---
 pom.xml                                                     | 6 +++---
 .../com/onarandombox/MultiverseCore/MultiverseCore.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4d7b82d2..c6bb49fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,15 +286,15 @@
         <!-- Start DynMap Dependency -->
         <dependency>
             <groupId>org.dynmap</groupId>
-            <artifactId>DynmapCore</artifactId>
-            <version>0.34.1</version>
+            <artifactId>DynmapCoreAPI</artifactId>
+            <version>1.0</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.dynmap</groupId>
             <artifactId>dynmap</artifactId>
-            <version>0.34.1</version>
+            <version>1.0</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index b7f648fc..cc09bdc1 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -124,7 +124,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
     private static Map<String, String> teleportQueue = new HashMap<String, String>();
 
     private AnchorManager anchorManager = new AnchorManager(this);
-    private MultiverseCoreConfiguration config;
     private DynmapConnector dynmapConnecter;
     private volatile MultiverseCoreConfiguration config;
 
@@ -1328,6 +1327,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
 
     public void setDynmap() {
         this.dynmapConnecter = new DynmapConnector(this.getServer().getPluginManager().getPlugin("dynmap"), this);
+    }
 
     @Override
     public Buscript getScriptAPI() {