Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-08-25 23:12:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from IntellectualSites/master

Browse Source 
Up
This commit is contained in:
Gabriele C 2016-01-20 12:44:33 +01:00
commit efeecd423e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java
View File

@ -42,11 +42,7 @@ public class PlotHandler {
if (!plot.isMerged()) { if (!plot.isMerged()) {
return false; return false;
} }
Set<Plot> plots; for (Plot current : MainUtil.getConnectedPlots(plot);) {
synchronized (Bukkit.getServer()) {
plots = MainUtil.getConnectedPlots(plot);
}
for (Plot current : plots) {
if (current.owner.equals(uuid)) { if (current.owner.equals(uuid)) {
return true; return true;
} }

2
src/main/java/com/plotsquared/listener/PlotListener.java
View File

@ -93,7 +93,7 @@ public class PlotListener {
for (final UUID uuid : PlotHandler.getOwners(plot)) { for (final UUID uuid : PlotHandler.getOwners(plot)) {
final PlotPlayer owner = UUIDHandler.getPlayer(uuid); final PlotPlayer owner = UUIDHandler.getPlayer(uuid);
if ((owner != null) && !owner.getUUID().equals(pp.getUUID())) { if ((owner != null) && !owner.getUUID().equals(pp.getUUID())) {
MainUtil.sendMessage(pp, C.NOTIFY_ENTER.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString())); MainUtil.sendMessage(owner, C.NOTIFY_ENTER.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString()));
} }
} }
} }