Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1050

This commit is contained in:
Jesse Boyd 2016-04-13 02:41:40 +10:00 committed by MattBDev
parent c2c20ff189
commit 40e063e702
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@ -112,11 +112,11 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
if (split.length == 3) {
this.version[2] = Integer.parseInt(split[2]);
}
} catch (NumberFormatException e) {
} catch (Exception e) {
e.printStackTrace();
PS.debug(StringMan.getString(Bukkit.getBukkitVersion()));
PS.debug(StringMan.getString(Bukkit.getBukkitVersion().split("-")[0].split("\\.")));
return new int[]{Integer.MAX_VALUE, 0, 0};
return new int[]{1,9,2};
}
}
return this.version;

2
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
View File

@ -200,8 +200,6 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
return this.platformGenerator;
}
@Override
public List<BlockPopulator> getDefaultPopulators(World world) {
try {

2
Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java
View File

@ -44,7 +44,7 @@ public class Owner extends SetCommand {
if (uuid == null) {
if (value.equalsIgnoreCase("none")) {
HashSet<Plot> connected = plot.getConnectedPlots();
plot.unlink();
plot.unlinkPlot(false, false);
for (Plot current : connected) {
current.unclaim();
current.removeSign();

3
Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
View File

@ -235,8 +235,7 @@ public abstract class EventUtil {
value = (HashSet<PlotBlock>) flag.getValue();
}
if (value == null || !value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock())) {
// TODO: fix the commented dead code
return true; //!(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s()));
return false; //!(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s()));
}
return true;
}