EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 06:36:44 +01:00
Code Issues Projects Releases Wiki Activity

Oh yeah.. I was in offline mode. That explains a lot.

Browse Source
This commit is contained in:
boy0001 2014-09-27 10:21:00 +10:00
parent d8137358f1
commit 5298486403
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
View File

@ -137,6 +137,9 @@ public class PlayerFunctions {
String world = loc.getWorld().getName(); String world = loc.getWorld().getName();
PlotWorld plotworld = PlotMain.getWorldSettings(world); PlotWorld plotworld = PlotMain.getWorldSettings(world);
if (plotworld==null) {
return null;
}
int size = plotworld.PLOT_WIDTH + plotworld.ROAD_WIDTH; int size = plotworld.PLOT_WIDTH + plotworld.ROAD_WIDTH;
int pathWidthLower; int pathWidthLower;
if ((plotworld.ROAD_WIDTH % 2) == 0) { if ((plotworld.ROAD_WIDTH % 2) == 0) {

3
PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java
View File

@ -71,6 +71,9 @@ public class Info extends SubCommand {
if (plot.owner != null) { if (plot.owner != null) {
owner = Bukkit.getOfflinePlayer(plot.owner).getName(); owner = Bukkit.getOfflinePlayer(plot.owner).getName();
} }
if (owner==null) {
owner = plot.owner.toString();
}
String info = C.PLOT_INFO.s(); String info = C.PLOT_INFO.s();
info = info.replaceAll("%alias%", plot.settings.getAlias().length() > 0 ? plot.settings.getAlias() : "none"); info = info.replaceAll("%alias%", plot.settings.getAlias().length() > 0 ? plot.settings.getAlias() : "none");

2
PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java
View File

@ -42,8 +42,6 @@ public class PlotMeConverter {
// TODO generate configuration based on PlotMe config // TODO generate configuration based on PlotMe config
// TODO // TODO
// - Plugin doesn't display a message if database is not setup at all // - Plugin doesn't display a message if database is not setup at all
// - I get null pointer exceptions when I try to use the plugin after the conversion process
// - Could be my fault when I added multiworld, or mega plots or something...
PlotMain.sendConsoleSenderMessage("Converting " + plots.size() + " plots for '" + world.toString() + "'..."); PlotMain.sendConsoleSenderMessage("Converting " + plots.size() + " plots for '" + world.toString() + "'...");
for (Plot plot : plots.values()) { for (Plot plot : plots.values()) {