TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-08 05:23:01 +00:00
Code Issues Projects Releases Wiki Activity

Plot home position + another attempt to fix minor UUID issue.

Browse source
This commit is contained in:
boy0001 2015-01-13 02:52:33 +11:00
parent d833935a30
commit f70b7c3f93
12 changed files with 71 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

21
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
View file

@ -280,7 +280,7 @@ import java.util.UUID;
return "unknown";
}
final OfflinePlayer plr = UUIDHandler.uuidWrapper.getOfflinePlayer(uuid);
if (plr == null) {
if (!plr.hasPlayedBefore()) {
return "unknown";
}
return plr.getName();
@ -889,22 +889,19 @@ import java.util.UUID;
* @return Home Location
*/
public static Location getPlotHome(final World w, final PlotId plotid) {
if (getPlot(w, plotid).settings.getPosition() == PlotHomePosition.DEFAULT) {
final Location bot = getPlotBottomLoc(w, plotid);
final int x = bot.getBlockX();
final int z = bot.getBlockZ() - 2;
final int y = getHeighestBlock(w, x, z);
return new Location(w, x, y, z);
} else {
final Location bot = getPlotBottomLoc(w, plotid), top = getPlotTopLoc(w, plotid);
Plot plot = getPlot(w, plotid);
BlockLoc home = plot.settings.getPosition();
final Location bot = getPlotBottomLoc(w, plotid);
if (home == null) {
final Location top = getPlotTopLoc(w, plotid);
final int x = top.getBlockX() - bot.getBlockX();
final int z = top.getBlockZ() - bot.getBlockZ();
final int y = getHeighestBlock(w, x, z);
return new Location(w, bot.getBlockX() + (x / 2), y, bot.getBlockZ() + (z / 2));
}
else {
return bot.add(home.x, home.y, home.z);
}
}
/**