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

Fix player location/current plot

Browse Source
This commit is contained in:
Jesse Boyd 2016-06-05 20:03:05 +10:00
parent 960ad50070
commit a1c722aa9e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java
View File

@ -112,7 +112,11 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
* @return the plot the player is standing on or null if standing on a road or not in a {@link PlotArea} * @return the plot the player is standing on or null if standing on a road or not in a {@link PlotArea}
*/ */
public Plot getCurrentPlot() { public Plot getCurrentPlot() {
return (Plot) getMeta("lastplot"); Plot value = (Plot) getMeta("lastplot");
if (value == null && !Settings.ENABLED_COMPONENTS.EVENTS) {
return getLocation().getPlot();
}
return value;
} }
/** /**
@ -216,7 +220,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
if (location != null) { if (location != null) {
return location; return location;
} }
return null; return getLocationFull();
} }
//////////////////////////////////////////////// ////////////////////////////////////////////////
@ -437,7 +441,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
public abstract void stopSpectating(); public abstract void stopSpectating();
/** /**
* The amount of money this playe * The amount of money this player has
* @return * @return
*/ */
public double getMoney() { public double getMoney() {