Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-06 20:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into new-vector-system

Browse Source 
# Conflicts:
#	build.gradle
#	worldedit-core/build.gradle
#	worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
This commit is contained in:
Jesse Boyd
2019-04-01 23:50:16 +11:00
parent bf53194650 603df92f79
commit 64a134a9ee
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,8 +79,6 @@ public class ScriptingCommands {
}
public static <T> T runScript(Actor actor, File f, String[] args, @Nullable Function<String, String> processor) throws WorldEditException {
Request.reset();
String filename = f.getPath();
int index = filename.lastIndexOf(".");
String ext = filename.substring(index + 1, filename.length());
@ -188,7 +186,7 @@ public class ScriptingCommands {
player.printError("More info: https://github.com/boy0001/CraftScripts/");
return;
}
this.worldEdit.runScript(LocationMaskedPlayerWrapper.unwrap(player), f, scriptArgs);
runScript(LocationMaskedPlayerWrapper.unwrap(player), f, scriptArgs);
}
@Command(aliases = {".s"}, usage = "[args...]", desc = "Execute last CraftScript", min = 0, max = -1)

1
worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java
View File

@ -200,7 +200,6 @@ public class WorldEditCommands {
@CommandPermissions("worldedit.debugpaste")
public void debugpaste(Actor actor) throws WorldEditException, IOException {
BBC.DOWNLOAD_LINK.send(actor, IncendoPaster.debugPaste());
}
@Command(

3
worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java
View File

@ -356,7 +356,8 @@ public class ForwardExtentCopy implements Operation {
entities = source.getEntities()
.stream()
.filter(entity -> entity.getState() != null &&
entity.getState().getType().getId().equals("minecraft:player"))
!entity.getState().getType().getId().equals("minecraft:player") &&
region.contains(entity.getLocation().toVector()))
.collect(Collectors.toList());
} else {
entities = new ArrayList<>();