Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-16 17:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #434 from sk89q/bugfix/flushing-when-done-2

Browse Source 
Flush / unbuffer more tools
This commit is contained in:
Matthew Miller 2018-10-31 14:52:11 +10:00 committed by GitHub
commit d7c528247b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java
View File

@ -79,7 +79,8 @@ public class BlockDataCyler implements DoubleActionBlockTool {
index = (index + 1) % currentProperty.getValues().size();
BlockState newBlock = block.with(currentProperty, currentProperty.getValues().get(index));
EditSession editSession = session.createEditSession(player);
try (EditSession editSession = session.createEditSession(player)) {
editSession.disableBuffering();
try {
editSession.setBlock(clicked.toVector(), newBlock);
@ -89,6 +90,7 @@ public class BlockDataCyler implements DoubleActionBlockTool {
} finally {
session.remember(editSession);
}
}
} else {
List<Property<?>> properties = Lists.newArrayList(block.getStates().keySet());
int index = properties.indexOf(currentProperty);

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java
View File

@ -76,8 +76,7 @@ public class FloatingTreeRemover implements BlockTool {
return true;
}
final EditSession editSession = session.createEditSession(player);
try (EditSession editSession = session.createEditSession(player)) {
try {
final Set<Vector> blockSet = bfs(world, clicked.toVector());
if (blockSet == null) {
@ -96,6 +95,7 @@ public class FloatingTreeRemover implements BlockTool {
} finally {
session.remember(editSession);
}
}
return true;
}

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java
View File

@ -69,8 +69,7 @@ public class FloodFillTool implements BlockTool {
return true;
}
EditSession editSession = session.createEditSession(player);
try (EditSession editSession = session.createEditSession(player)) {
try {
recurse(editSession, clicked.toVector().toBlockVector(),
clicked.toVector(), range, initialType, new HashSet<>());
@ -79,6 +78,7 @@ public class FloodFillTool implements BlockTool {
} finally {
session.remember(editSession);
}
}
return true;
}

8
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java
View File

@ -53,8 +53,8 @@ public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTo
public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
Location pos = getTargetFace(player);
if (pos == null) return false;
EditSession eS = session.createEditSession(player);
try {
try (EditSession eS = session.createEditSession(player)) {
eS.disableBuffering();
BlockStateHolder applied = secondary.apply(pos.toVector());
if (applied.getBlockType().getMaterial().isAir()) {
eS.setBlock(pos.toVector(), secondary);
@ -73,8 +73,8 @@ public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTo
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
Location pos = getTargetFace(player);
if (pos == null) return false;
EditSession eS = session.createEditSession(player);
try {
try (EditSession eS = session.createEditSession(player)) {
eS.disableBuffering();
BlockStateHolder applied = primary.apply(pos.toVector());
if (applied.getBlockType().getMaterial().isAir()) {
eS.setBlock(pos.toVector(), primary);

4
worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java
View File

@ -48,8 +48,7 @@ public class TreePlanter implements BlockTool {
@Override
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
EditSession editSession = session.createEditSession(player);
try (EditSession editSession = session.createEditSession(player)) {
try {
boolean successful = false;
@ -68,6 +67,7 @@ public class TreePlanter implements BlockTool {
} finally {
session.remember(editSession);
}
}
return true;
}