Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #228

Browse Source
This commit is contained in:
Jesse Boyd 2016-08-10 17:32:05 +10:00
parent 5c0ae62b17
commit 35883cfb16
6 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
View File

@ -90,6 +90,7 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
fieldBits = DataPaletteBlock.class.getDeclaredField("b"); fieldBits = DataPaletteBlock.class.getDeclaredField("b");
fieldBits.setAccessible(true); fieldBits.setAccessible(true);
getEntitySlices = net.minecraft.server.v1_10_R1.Chunk.class.getDeclaredMethod("getEntitySlices"); getEntitySlices = net.minecraft.server.v1_10_R1.Chunk.class.getDeclaredMethod("getEntitySlices");
getEntitySlices.setAccessible(true);
if (adapter == null) { if (adapter == null) {
setupAdapter(new com.boydti.fawe.bukkit.v1_10.FaweAdapter_1_10()); setupAdapter(new com.boydti.fawe.bukkit.v1_10.FaweAdapter_1_10());
Fawe.debug("Using adapter: " + adapter); Fawe.debug("Using adapter: " + adapter);

8
bukkit110/src/main/resources/plugin.yml
View File

@ -21,18 +21,10 @@ commands:
fcancel: fcancel:
description: (FAWE) Cancel your edit description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel] aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
'/p':
description: VoxelSniper perform command
aliases: [perform,/perform]
'/d':
description: VoxelSniper default command
aliases: [default,/default]
permissions: permissions:
fawe.bypass: fawe.bypass:
default: false default: false
fawe.admin: fawe.admin:
default: false default: false
fawe.stream:
default: false
fawe.reload: fawe.reload:
default: false default: false

8
bukkit1710/src/main/resources/plugin.yml
View File

@ -21,18 +21,10 @@ commands:
fcancel: fcancel:
description: (FAWE) Cancel your edit description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel] aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
'/p':
description: VoxelSniper perform command
aliases: [perform,/perform]
'/d':
description: VoxelSniper default command
aliases: [default,/default]
permissions: permissions:
fawe.bypass: fawe.bypass:
default: false default: false
fawe.admin: fawe.admin:
default: false default: false
fawe.stream:
default: false
fawe.reload: fawe.reload:
default: false default: false

8
bukkit18/src/main/resources/plugin.yml
View File

@ -21,18 +21,10 @@ commands:
fcancel: fcancel:
description: (FAWE) Cancel your edit description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel] aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
'/p':
description: VoxelSniper perform command
aliases: [perform,/perform]
'/d':
description: VoxelSniper default command
aliases: [default,/default]
permissions: permissions:
fawe.bypass: fawe.bypass:
default: false default: false
fawe.admin: fawe.admin:
default: false default: false
fawe.stream:
default: false
fawe.reload: fawe.reload:
default: false default: false

8
bukkit19/src/main/resources/plugin.yml
View File

@ -24,19 +24,11 @@ commands:
fcancel: fcancel:
description: (FAWE) Cancel your edit description: (FAWE) Cancel your edit
aliases: [fawecancel,/fcancel,/cancel,/fawecancel] aliases: [fawecancel,/fcancel,/cancel,/fawecancel]
'/p':
description: VoxelSniper perform command
aliases: [perform,/perform]
'/d':
description: VoxelSniper default command
aliases: [default,/default]
permissions: permissions:
fawe.bypass: fawe.bypass:
default: false default: false
fawe.admin: fawe.admin:
default: false default: false
fawe.stream:
default: false
fawe.fixlighting: fawe.fixlighting:
default: false default: false
fawe.reload: fawe.reload:

2
core/src/main/java/com/boydti/fawe/example/MappedFaweQueue.java
View File

@ -404,7 +404,7 @@ public abstract class MappedFaweQueue<WORLD, CHUNK, SECTION> extends FaweQueue {
loadChunk(getWorld(), cx, cz, true); loadChunk(getWorld(), cx, cz, true);
} else if (Settings.HISTORY.CHUNK_WAIT_MS > 0) { } else if (Settings.HISTORY.CHUNK_WAIT_MS > 0) {
loadChunk.value = new IntegerPair(cx, cz); loadChunk.value = new IntegerPair(cx, cz);
TaskManager.IMP.sync(loadChunk, Settings.HISTORY.CHUNK_WAIT_MS); TaskManager.IMP.syncWhenFree(loadChunk, Settings.HISTORY.CHUNK_WAIT_MS);
if (!isChunkLoaded(cx, cz)) { if (!isChunkLoaded(cx, cz)) {
throw new FaweException.FaweChunkLoadException(); throw new FaweException.FaweChunkLoadException();
} }