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

# 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
Dieser Commit ist enthalten in:
Jesse Boyd 2019-04-01 23:50:16 +11:00
Commit 64a134a9ee
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 59F1DE6293AF6E1F
6 geänderte Dateien mit 33 neuen und 15 gelöschten Zeilen

19
ISSUE_TEMPLATE.md Normale Datei
Datei anzeigen

@ -0,0 +1,19 @@
# Bug report for FastAsyncWorldEdit 1.13.x
<!--- Follow this template if reporting an issue. -->
<!--- Remove this template if making a suggestion or asking a question. -->
<!--- Please comment or react to an existing ticket if it exists -->
**Debug paste link**:
<!--- Enter /fawe debugpaste in game or in your console and copy the output here -->
**Description of the problem:**
<!--- Include relevant info like errors or a picture of the problem -->
**How to replicate**:
<!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
**Checklist**:
<!--- Make sure you've completed the following steps (put an "X" between of brackets): -->
- [] I included a `/fawe debugpaste` link
- [] I made sure there aren't duplicates of this report [(Use Search)](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues?utf8=%E2%9C%93&q=is%3Aissue)
- [] I made sure I am using an up-to-date version of [FAWE for 1.13.x](https://ci.athion.net/job/FAWE-1.13/)
- [] I made sure the bug/error is not caused by any other plugin

Datei anzeigen

@ -11,7 +11,7 @@ FAWE is a fork of WorldEdit that has huge speed and memory improvements and cons
* [Spigot Page](https://www.spigotmc.org/threads/fast-async-worldedit.100104/) * [Spigot Page](https://www.spigotmc.org/threads/fast-async-worldedit.100104/)
* [Discord](https://discord.gg/ngZCzbU) * [Discord](https://discord.gg/ngZCzbU)
* [Wiki](https://github.com/boy0001/FastAsyncWorldedit/wiki) * [Wiki](https://github.com/boy0001/FastAsyncWorldedit/wiki)
* [Report Issue](https://github.com/boy0001/FastAsyncWorldedit/issues/new) * [Report Issue](https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues/new)
## Downloads ## Downloads
### 1.13+ ### 1.13+

Datei anzeigen

@ -194,6 +194,7 @@ public final class IncendoPaster {
"# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your " "# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your "
+ "problem\n"); + "problem\n");
b.append("\n# Server Information\n"); b.append("\n# Server Information\n");
b.append("server.platform: ").append(Fawe.imp().getPlatform()).append('\n');
b.append(Fawe.imp().getDebugInfo()).append('\n'); b.append(Fawe.imp().getDebugInfo()).append('\n');
b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n"); b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
Runtime runtime = Runtime.getRuntime(); Runtime runtime = Runtime.getRuntime();

Datei anzeigen

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

Datei anzeigen

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

Datei anzeigen

@ -356,7 +356,8 @@ public class ForwardExtentCopy implements Operation {
entities = source.getEntities() entities = source.getEntities()
.stream() .stream()
.filter(entity -> entity.getState() != null && .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()); .collect(Collectors.toList());
} else { } else {
entities = new ArrayList<>(); entities = new ArrayList<>();