SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup, fixed doors, chunk entity fetching

Browse Source 
By: Tahg <tahgtahv@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2011-03-11 16:25:35 -05:00
parent ff806bfa66
commit a7ed1c966b
9 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/src/main/java/org/bukkit/craftbukkit/scheduler/CraftFuture.java
View File

@@ -25,7 +25,7 @@ public class CraftFuture<T> implements Runnable, Future<T> {
public void run() {
synchronized(this) {
if(cancelled) {
if (cancelled) {
return;
}
running = true;
@@ -51,7 +51,7 @@ public class CraftFuture<T> implements Runnable, Future<T> {
public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
synchronized(this) {
if(isDone()) {
if (isDone()) {
return getResult();
}
this.wait(TimeUnit.MILLISECONDS.convert(timeout, unit));
@@ -60,10 +60,10 @@ public class CraftFuture<T> implements Runnable, Future<T> {
}
public T getResult() throws ExecutionException {
if(cancelled) {
if (cancelled) {
throw new CancellationException();
}
if(e!=null) {
if (e!=null) {
throw new ExecutionException(e);
}
return returnStore.getObject();
@@ -83,14 +83,14 @@ public class CraftFuture<T> implements Runnable, Future<T> {
public boolean cancel(boolean mayInterruptIfRunning) {
synchronized(this) {
if(cancelled) {
if (cancelled) {
return false;
}
cancelled = true;
if(taskId!=-1) {
if (taskId!=-1) {
craftScheduler.cancelTask(taskId);
}
if(!running && !done) {
if (!running && !done) {
return true;
} else {
return false;