EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 10:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Let generator be up to the implementation

Browse Source
This commit is contained in:
Jesse Boyd
2016-09-17 16:02:05 +10:00
parent 56227a6d7d
commit 264114332b
18 changed files with 79 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Nukkit/src/main/java/com/plotsquared/nukkit/NukkitMain.java
View File

@ -15,10 +15,13 @@ import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.generator.GeneratorWrapper;
import com.intellectualcrafters.plot.generator.HybridGen;
import com.intellectualcrafters.plot.generator.HybridPlotManager;
import com.intellectualcrafters.plot.generator.HybridUtils;
import com.intellectualcrafters.plot.generator.IndependentPlotGenerator;
import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.PlotManager;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.object.chat.PlainChatManager;
@ -407,4 +410,19 @@ public final class NukkitMain extends PluginBase implements Listener, IPlotMain
}
return names;
}
@Override
public IndependentPlotGenerator getDefaultGenerator() {
return new HybridGen() {
@Override
public PlotManager getNewPlotManager() {
return new HybridPlotManager() {
@Override
public int getWorldHeight() {
return 127;
}
};
}
};
}
}

4
Nukkit/src/main/java/com/plotsquared/nukkit/generator/NukkitPlotGenerator.java
View File

@ -57,7 +57,7 @@ public class NukkitPlotGenerator extends Generator implements GeneratorWrapper<G
@Override
public PlotManager getNewPlotManager() {
return new HybridGen().getNewPlotManager();
return PS.get().IMP.getDefaultGenerator().getNewPlotManager();
}
@Override
@ -67,7 +67,7 @@ public class NukkitPlotGenerator extends Generator implements GeneratorWrapper<G
@Override
public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
return new HybridGen().getNewPlotArea(world, id, min, max);
return PS.get().IMP.getDefaultGenerator().getNewPlotArea(world, id, min, max);
}
@Override

2
Nukkit/src/main/java/com/plotsquared/nukkit/listeners/WorldEvents.java
View File

@ -49,7 +49,7 @@ public class WorldEvents implements Listener {
settings.put("generator", gen);
PS.get().loadWorld(name, new NukkitPlotGenerator(settings));
for (PlotArea area : PS.get().getPlotAreas(name)) {
area.MAX_BUILD_HEIGHT = Math.min(128, area.MAX_BUILD_HEIGHT);
area.MAX_BUILD_HEIGHT = Math.min(127, area.MAX_BUILD_HEIGHT);
}
}
} catch (Throwable e) {

4
Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitSetupUtils.java
View File

@ -36,7 +36,7 @@ public class NukkitSetupUtils extends SetupUtils {
String testWorld = "CheckingPlotSquaredGenerator";
HashMap<String, Object> map = new HashMap<>();
map.put("world", testWorld);
map.put("plot-generator", new HybridGen());
map.put("plot-generator", PS.get().IMP.getDefaultGenerator());
NukkitPlotGenerator gen = new NukkitPlotGenerator(map);
SetupUtils.generators.put("PlotSquared", gen);
}
@ -119,7 +119,7 @@ public class NukkitSetupUtils extends SetupUtils {
if (object.setupGenerator != null) {
HashMap<String, Object> map = new HashMap<>();
map.put("world", object.world);
map.put("plot-generator", new HybridGen());
map.put("plot-generator", PS.get().IMP.getDefaultGenerator());
plugin.getServer().generateLevel(object.world, object.world.hashCode(), NukkitPlotGenerator.class, map);
} else {
plugin.getServer().generateLevel(object.world, object.world.hashCode());

2
Nukkit/src/main/java/com/plotsquared/nukkit/util/block/NukkitHybridGen.java
View File

@ -24,7 +24,7 @@ public class NukkitHybridGen extends NukkitPlotGenerator {
}
}
}
existing.put("plot-generator", new HybridGen());
existing.put("plot-generator", PS.get().IMP.getDefaultGenerator());
return existing;
}
}