Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-28 05:35:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix for forest / bump version

Browse Source
This commit is contained in:
Jesse Boyd 2016-04-22 09:12:38 +10:00
parent e158b4d222
commit 70362d348f
10 changed files with 114 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -10,7 +10,7 @@ buildscript {
}
group = 'com.boydti.fawe'
version = '3.3.20'
version = '3.3.21'
description = """FastAsyncWorldEdit"""
subprojects {

2
bukkit/build/resources/main/plugin.yml
View File

@ -1,6 +1,6 @@
name: FastAsyncWorldEdit
main: com.boydti.fawe.bukkit.FaweBukkit
version: 3.3.20
version: 3.3.21
description: Fast Async WorldEdit plugin
authors: [Empire92]
loadbefore: [WorldEdit]

4
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue_1_8.java
View File

@ -423,7 +423,9 @@ public class BukkitQueue_1_8 extends BukkitQueue_All {
}, 1);
return true;
} catch (final Exception e) {
e.printStackTrace();
if (Thread.currentThread() == Fawe.get().getMainThread()) {
e.printStackTrace();
}
}
return false;
}

4
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9.java
View File

@ -212,7 +212,9 @@ public class BukkitQueue_1_9 extends BukkitQueue_All {
}
return true;
} catch (final Throwable e) {
e.printStackTrace();
if (Thread.currentThread() == Fawe.get().getMainThread()) {
e.printStackTrace();
}
}
return false;
}

4
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
View File

@ -185,7 +185,9 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_All {
}
return true;
} catch (final Throwable e) {
e.printStackTrace();
if (Thread.currentThread() == Fawe.get().getMainThread()) {
e.printStackTrace();
}
}
return false;
}

2
bukkit/src/main/resources/plugin.yml
View File

@ -1,6 +1,6 @@
name: FastAsyncWorldEdit
main: com.boydti.fawe.bukkit.FaweBukkit
version: 3.3.20
version: 3.3.21
description: Fast Async WorldEdit plugin
authors: [Empire92]
loadbefore: [WorldEdit]

34
core/src/main/java/com/boydti/fawe/util/TaskManager.java
View File

@ -56,4 +56,38 @@ public abstract class TaskManager {
}
});
}
public <T> T sync(final RunnableVal<T> function) {
if (Fawe.get().getMainThread() == Thread.currentThread()) {
function.run();
return function.value;
}
RunnableVal<RuntimeException> run = new RunnableVal<RuntimeException>() {
@Override
public void run(RuntimeException value) {
try {
function.run();
} catch (RuntimeException e) {
this.value = e;
} catch (Throwable neverHappens) {
neverHappens.printStackTrace();
}
synchronized (function) {
function.notifyAll();
}
}
};
TaskManager.IMP.task(run);
if (run.value != null) {
throw run.value;
}
try {
synchronized (function) {
function.wait(15000);
}
} catch (InterruptedException e) {
e.printStackTrace();
}
return function.value;
}
}

78
core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java
View File

@ -90,28 +90,73 @@ public class WorldWrapper extends AbstractWorld {
}
@Override
public boolean generateTree(EditSession editSession, Vector pt) throws MaxChangedBlocksException {
return parent.generateTree(editSession, pt);
public boolean generateTree(final EditSession editSession, final Vector pt) throws MaxChangedBlocksException {
return TaskManager.IMP.sync(new RunnableVal<Boolean>() {
@Override
public void run(Boolean ignore) {
try {
this.value = parent.generateTree(editSession, pt);
} catch (MaxChangedBlocksException e) {
e.printStackTrace();
}
}
});
}
@Override
public boolean generateBigTree(EditSession editSession, Vector pt) throws MaxChangedBlocksException {
return parent.generateBigTree(editSession, pt);
public boolean generateBigTree(final EditSession editSession, final Vector pt) throws MaxChangedBlocksException {
return TaskManager.IMP.sync(new RunnableVal<Boolean>() {
@Override
public void run(Boolean ignore) {
try {
this.value = parent.generateBigTree(editSession, pt);
} catch (MaxChangedBlocksException e) {
e.printStackTrace();
}
}
});
}
@Override
public boolean generateBirchTree(EditSession editSession, Vector pt) throws MaxChangedBlocksException {
return parent.generateBirchTree(editSession, pt);
public boolean generateBirchTree(final EditSession editSession, final Vector pt) throws MaxChangedBlocksException {
return TaskManager.IMP.sync(new RunnableVal<Boolean>() {
@Override
public void run(Boolean ignore) {
try {
this.value = parent.generateBirchTree(editSession, pt);
} catch (MaxChangedBlocksException e) {
e.printStackTrace();
}
}
});
}
@Override
public boolean generateRedwoodTree(EditSession editSession, Vector pt) throws MaxChangedBlocksException {
return parent.generateRedwoodTree(editSession, pt);
public boolean generateRedwoodTree(final EditSession editSession, final Vector pt) throws MaxChangedBlocksException {
return TaskManager.IMP.sync(new RunnableVal<Boolean>() {
@Override
public void run(Boolean ignore) {
try {
this.value = parent.generateRedwoodTree(editSession, pt);
} catch (MaxChangedBlocksException e) {
e.printStackTrace();
}
}
});
}
@Override
public boolean generateTallRedwoodTree(EditSession editSession, Vector pt) throws MaxChangedBlocksException {
return parent.generateTallRedwoodTree(editSession, pt);
public boolean generateTallRedwoodTree(final EditSession editSession, final Vector pt) throws MaxChangedBlocksException {
return TaskManager.IMP.sync(new RunnableVal<Boolean>() {
@Override
public void run(Boolean ignore) {
try {
this.value = parent.generateTallRedwoodTree(editSession, pt);
} catch (MaxChangedBlocksException e) {
e.printStackTrace();
}
}
});
}
@Override
@ -293,8 +338,17 @@ public class WorldWrapper extends AbstractWorld {
}
@Override
public boolean generateTree(TreeGenerator.TreeType type, EditSession editSession, Vector position) throws MaxChangedBlocksException {
return parent.generateTree(type, editSession, position);
public boolean generateTree(final TreeGenerator.TreeType type, final EditSession editSession, final Vector position) throws MaxChangedBlocksException {
return TaskManager.IMP.sync(new RunnableVal<Boolean>() {
@Override
public void run(Boolean ignore) {
try {
this.value = parent.generateTree(editSession, position);
} catch (MaxChangedBlocksException e) {
e.printStackTrace();
}
}
});
}
@Override

2
forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java
View File

@ -18,7 +18,7 @@ import org.spongepowered.api.plugin.PluginContainer;
import org.spongepowered.api.profile.GameProfileManager;
import org.spongepowered.api.world.World;
@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.3.20")
@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.3.21")
public class SpongeMain {
public PluginContainer plugin;

2
pom.xml
View File

@ -8,7 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>FastAsyncWorldEdit</artifactId>
<version>3.3.20</version>
<version>3.3.21</version>
<name>FastAsyncWorldEdit</name>
<packaging>jar</packaging>
<build>