Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-06-30 22:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'breaking-114' into filter-pipeline

Browse Source
This commit is contained in:
Jesse Boyd 2019-07-17 14:55:04 +10:00
commit ae9efc3df1
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -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");

BIN
worldedit-bukkit/src/main/resources/DummyFawe.src
View File

Binary file not shown.

17
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
View File

@ -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);
} }
}); });