Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 10:36:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge error, Add correct dependency versions

Browse Source
This commit is contained in:
Eric Stokes 2012-10-22 17:22:33 -06:00
parent 5ed049d6b0
commit 95ee1d731c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -286,15 +286,15 @@
<!-- Start DynMap Dependency --> <!-- Start DynMap Dependency -->
<dependency> <dependency>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>DynmapCore</artifactId> <artifactId>DynmapCoreAPI</artifactId>
<version>0.34.1</version> <version>1.0</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>dynmap</artifactId> <artifactId>dynmap</artifactId>
<version>0.34.1</version> <version>1.0</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

2
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -124,7 +124,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
private static Map<String, String> teleportQueue = new HashMap<String, String>(); private static Map<String, String> teleportQueue = new HashMap<String, String>();
private AnchorManager anchorManager = new AnchorManager(this); private AnchorManager anchorManager = new AnchorManager(this);
private MultiverseCoreConfiguration config;
private DynmapConnector dynmapConnecter; private DynmapConnector dynmapConnecter;
private volatile MultiverseCoreConfiguration config; private volatile MultiverseCoreConfiguration config;
@ -1328,6 +1327,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
public void setDynmap() { public void setDynmap() {
this.dynmapConnecter = new DynmapConnector(this.getServer().getPluginManager().getPlugin("dynmap"), this); this.dynmapConnecter = new DynmapConnector(this.getServer().getPluginManager().getPlugin("dynmap"), this);
}
@Override @Override
public Buscript getScriptAPI() { public Buscript getScriptAPI() {