Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-07 03:00:29 +01:00
Code Issues Projects Releases Wiki Activity

FAWE support for pasting worldedit schematics

Browse Source
This commit is contained in:
Esophose 2019-07-19 23:15:29 -06:00
parent f155f3e694
commit 86394140e6
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -50,9 +50,6 @@ dependencies {
shade (group: 'org.apache.commons', name: 'commons-lang3', version: '3.0') shade (group: 'org.apache.commons', name: 'commons-lang3', version: '3.0')
shade (group: 'commons-io', name: 'commons-io', version: '2.5') shade (group: 'commons-io', name: 'commons-io', version: '2.5')
// JetBrains Annotations
compile (group: 'org.jetbrains', name: 'annotations', version: '13.0')
// Songoda Updater // Songoda Updater
shade (group: 'com.songoda', name: 'songodaupdater', version: '1') shade (group: 'com.songoda', name: 'songodaupdater', version: '1')

3
src/main/java/me/goodandevil/skyblock/listeners/Entity.java
View File

@ -656,7 +656,8 @@ public class Entity implements Listener {
@EventHandler @EventHandler
public void onCreatureSpawn(CreatureSpawnEvent event) { public void onCreatureSpawn(CreatureSpawnEvent event) {
if (event.getEntity() instanceof ArmorStand || event.getEntity() instanceof FallingBlock if (event.getEntity() instanceof ArmorStand
|| event.getEntity() instanceof FallingBlock
|| event.getEntity() instanceof org.bukkit.entity.Item) { || event.getEntity() instanceof org.bukkit.entity.Item) {
return; return;
} }

10
src/main/java/me/goodandevil/skyblock/utils/structure/SchematicUtil.java
View File

@ -17,7 +17,7 @@ public class SchematicUtil {
if (!Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) if (!Bukkit.getPluginManager().isPluginEnabled("WorldEdit"))
throw new IllegalStateException("Tried to generate an island using a schematic file without WorldEdit installed!"); throw new IllegalStateException("Tried to generate an island using a schematic file without WorldEdit installed!");
Bukkit.getScheduler().runTask(SkyBlock.getInstance(), () -> { Runnable pasteTask = () -> {
if (NMSUtil.getVersionNumber() > 12) { // WorldEdit 7 if (NMSUtil.getVersionNumber() > 12) { // WorldEdit 7
com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat format = com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats.findByFile(schematicFile); com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat format = com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats.findByFile(schematicFile);
try (com.sk89q.worldedit.extent.clipboard.io.ClipboardReader reader = format.getReader(new FileInputStream(schematicFile))) { try (com.sk89q.worldedit.extent.clipboard.io.ClipboardReader reader = format.getReader(new FileInputStream(schematicFile))) {
@ -59,7 +59,13 @@ public class SchematicUtil {
e.printStackTrace(); e.printStackTrace();
} }
} }
}); };
if (Bukkit.getPluginManager().isPluginEnabled("FastAsyncWorldEdit")) {
Bukkit.getScheduler().runTaskAsynchronously(SkyBlock.getInstance(), pasteTask);
} else {
Bukkit.getScheduler().runTask(SkyBlock.getInstance(), pasteTask);
}
return new Float[] { location.getYaw(), location.getPitch() }; return new Float[] { location.getYaw(), location.getPitch() };
} }