Fixes #657
Fixes #656
Fixes #653
Fixes #652
Fixes #585
This commit is contained in:
Jesse Boyd
2015-10-05 00:59:43 +11:00
parent 9d77b422df
commit f2431c869f
23 changed files with 505 additions and 332 deletions

View File

@ -172,7 +172,9 @@ public class PlotAnalysis {
@Override
public void run() {
try {
wait(10000);
synchronized (this) {
wait(10000);
}
} catch (final InterruptedException e) {
e.printStackTrace();
}

View File

@ -1,6 +1,5 @@
package com.intellectualcrafters.plot.object;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@ -66,6 +65,11 @@ public class PlotHandler {
}
public static void setOwner(Plot plot, UUID owner) {
if (!plot.hasOwner()) {
plot.owner = owner;
plot.create();
return;
}
if (!plot.isMerged()) {
if (!plot.owner.equals(owner)) {
plot.owner = owner;