Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-26 17:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed plugin.yml

Browse Source
This commit is contained in:
boy0001 2015-01-02 12:35:47 +11:00
parent b58b6f5963
commit 9bca812d28
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
View File

@ -308,12 +308,14 @@ import java.util.concurrent.TimeUnit;
* @param player player * @param player player
* *
* @return Set Containing the players plots * @return Set Containing the players plots
* - ignores non plot worlds
*/ */
public static Set<Plot> getPlots(final Player player) { public static Set<Plot> getPlots(final Player player) {
final UUID uuid = UUIDHandler.getUUID(player); final UUID uuid = UUIDHandler.getUUID(player);
final ArrayList<Plot> myplots = new ArrayList<>(); final ArrayList<Plot> myplots = new ArrayList<>();
for (final HashMap<PlotId, Plot> world : plots.values()) { for (final String world : plots.keySet()) {
for (final Plot plot : world.values()) { if (isPlotWorld(world)) {
for (final Plot plot : plots.get(world).values()) {
if (plot.hasOwner()) { if (plot.hasOwner()) {
if (plot.getOwner().equals(uuid)) { if (plot.getOwner().equals(uuid)) {
myplots.add(plot); myplots.add(plot);
@ -321,6 +323,7 @@ import java.util.concurrent.TimeUnit;
} }
} }
} }
}
return new HashSet<>(myplots); return new HashSet<>(myplots);
} }

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
View File

@ -51,7 +51,7 @@ public class HybridGen extends PlotGenerator {
/** /**
* Set to static to re-use the same managet for all Default World Generators * Set to static to re-use the same managet for all Default World Generators
*/ */
private static PlotManager manager = null; private PlotManager manager = null;
/** /**
* Some generator specific variables (implementation dependent) * Some generator specific variables (implementation dependent)

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
View File

@ -1037,6 +1037,9 @@ import java.util.UUID;
} }
final PlotWorld plotworld = PlotMain.getWorldSettings(world); final PlotWorld plotworld = PlotMain.getWorldSettings(world);
final PlotManager manager = PlotMain.getPlotManager(world); final PlotManager manager = PlotMain.getPlotManager(world);
System.out.print("WORLD = "+(world));
System.out.print("MANAGER = "+(manager == null));
System.out.print("PLOTWORLD = "+(plotworld == null));
return manager.getPlotBottomLocAbs(plotworld, id); return manager.getPlotBottomLocAbs(plotworld, id);
} }

2
PlotSquared/src/main/resources/plugin.yml
View File

@ -5,7 +5,7 @@ load: STARTUP
description: > description: >
Easy, yet powerful Plot World generation and management. Easy, yet powerful Plot World generation and management.
authors: [Citymonstret, Empire92] authors: [Citymonstret, Empire92]
softdepend: [WorldEdit, BarAPI, PlotMe, CameraAPI] softdepend: [WorldEdit, BarAPI, PlotMe, CameraAPI, Vault]
database: false database: false
commands: commands:
plots: plots: