Merge branch 'breaking-114' into filter-pipeline

Dieser Commit ist enthalten in:
Jesse Boyd 2019-07-17 14:55:04 +10:00
Commit ae9efc3df1
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 59F1DE6293AF6E1F
3 geänderte Dateien mit 15 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -276,7 +276,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
} }
File pluginsFolder = MainUtil.getJarFile().getParentFile(); File pluginsFolder = MainUtil.getJarFile().getParentFile();
for (File file : pluginsFolder.listFiles()) { for (File file : pluginsFolder.listFiles()) {
if (file.length() == 2016) return; if (file.length() == 2009) return;
} }
Plugin plugin = Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit"); Plugin plugin = Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit");
File dummy = MainUtil.copyFile(MainUtil.getJarFile(), "DummyFawe.src", pluginsFolder, "DummyFawe.jar"); File dummy = MainUtil.copyFile(MainUtil.getJarFile(), "DummyFawe.src", pluginsFolder, "DummyFawe.jar");

Datei anzeigen

@ -183,9 +183,20 @@ public class SpongeSchematicReader extends NBTSchematicReader {
setupClipboard(0, uuid); setupClipboard(0, uuid);
} }
int[] pos = value.getIntArray("Pos"); int[] pos = value.getIntArray("Pos");
int x = pos[0]; int x,y,z;
int y = pos[1]; if (pos.length != 3) {
int z = pos[2]; System.out.println("Invalid tile " + value);
if (!value.containsKey("x") || !value.containsKey("y") || !value.containsKey("z")) {
return;
}
x = value.getInt("x");
y = value.getInt("y");
z = value.getInt("z");
} else {
x = pos[0];
y = pos[1];
z = pos[2];
}
fc.setTile(x, y, z, value); fc.setTile(x, y, z, value);
} }
}); });