EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 11:13:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
This commit is contained in:
Jesse Boyd
2016-05-28 08:45:35 +10:00
parent 28a5c9f597 604f62dbd3
commit b5cc6eeb0c
6 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
View File

@@ -62,6 +62,7 @@ import org.slf4j.Logger;
import org.spongepowered.api.Game;
import org.spongepowered.api.Server;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.config.ConfigDir;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.game.state.GameAboutToStartServerEvent;
@@ -73,6 +74,7 @@ import org.spongepowered.api.world.World;
import org.spongepowered.api.world.gen.GenerationPopulator;
import org.spongepowered.api.world.gen.WorldGenerator;
import org.spongepowered.api.world.gen.WorldGeneratorModifier;
import java.nio.file.Path;
@Plugin(id = "plotsquared", name = "PlotSquared", description = "Easy, yet powerful Plot World generation and management.",
url = "https://github.com/IntellectualSites/PlotSquared", version = "3.3.3")
@@ -88,8 +90,13 @@ public class SpongeMain implements IPlotMain {
@Inject
private Game game;
private Server server;
@Inject
@ConfigDir(sharedRoot = false)
private Path privateConfigDir;
private GameProfileManager resolver;
// @Override
@@ -139,7 +146,7 @@ public class SpongeMain implements IPlotMain {
@Override
public File getDirectory() {
return new File("mods/PlotSquared");
return privateConfigDir.toFile();
}
@Override