EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared

Browse Source
This commit is contained in:
Jesse Boyd 2016-10-14 15:14:35 +11:00
commit d6be5703ae
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,8 +59,11 @@ public abstract class EventUtil {
public abstract void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added); public abstract void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added);
public void doJoinTask(final PlotPlayer player) { public void doJoinTask(final PlotPlayer player) {
if (player == null) {
return; //possible future warning message to figure out where we are retrieving null
}
if (ExpireManager.IMP != null) { if (ExpireManager.IMP != null) {
ExpireManager.IMP.handleJoin(player); ExpireManager.IMP.handleJoin(player);
} }
if (PS.get().worldedit != null) { if (PS.get().worldedit != null) {
if (player.getAttribute("worldedit")) { if (player.getAttribute("worldedit")) {