Some plot area restructuring

This commit is contained in:
Jesse Boyd
2017-03-23 11:10:29 +11:00
parent a07ed4eafd
commit 5d6f4c6668
55 changed files with 716 additions and 176 deletions

View File

@ -36,7 +36,7 @@ public class PlotClearEvent extends AbstractEvent implements Cancellable {
* @return String
*/
public String getWorld() {
return this.plot.getArea().worldname;
return this.plot.getWorldName();
}
@Override

View File

@ -36,7 +36,7 @@ public class PlotComponentSetEvent extends AbstractEvent {
* @return String
*/
public String getWorld() {
return this.plot.getArea().worldname;
return this.plot.getWorldName();
}
/**

View File

@ -33,7 +33,7 @@ public class PlotDeleteEvent extends AbstractEvent {
* @return String
*/
public String getWorld() {
return plot.getArea().worldname;
return plot.getWorldName();
}
@Override

View File

@ -81,7 +81,7 @@ public class SpongeEventUtil extends EventUtil {
@Override
public boolean callMerge(Plot plot, ArrayList<PlotId> plots) {
return callEvent(new PlotMergeEvent(SpongeUtil.getWorld(plot.getArea().worldname), plot, plots));
return callEvent(new PlotMergeEvent(SpongeUtil.getWorld(plot.getWorldName()), plot, plots));
}
@Override

View File

@ -47,6 +47,14 @@ public class SpongeSetupUtils extends SetupUtils {
}
}
@Override
public void unload(String worldName, boolean safe) {
Optional<World> world = Sponge.getServer().getWorld(worldName);
if (world.isPresent()) {
Sponge.getServer().unloadWorld(world.get());
}
}
@Override
public String getGenerator(PlotArea plotArea) {
if (SetupUtils.generators.isEmpty()) {