This commit is contained in:
Jesse Boyd
2018-08-24 01:22:30 +10:00
parent 963d1192c2
commit dbd31ea347
14 changed files with 54 additions and 19 deletions

View File

@ -35,12 +35,14 @@ dependencies {
processResources {
from (sourceSets.main.resources.srcDirs) {
expand 'internalVersion': project.internalVersion
expand 'version': project.internalVersion
include 'plugin.yml'
include 'fawe.properties'
}
from (sourceSets.main.resources.srcDirs) {
exclude 'plugin.yml'
exclude 'fawe.properties'
}
}

View File

@ -22,6 +22,7 @@ package com.sk89q.worldedit.bukkit;
import static com.google.common.base.Preconditions.checkNotNull;
import com.bekvon.bukkit.residence.commands.material;
import com.sk89q.worldedit.NotABlockException;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.entity.Entity;
@ -336,7 +337,7 @@ public class BukkitAdapter {
if (itemStack.getType().isBlock()) {
return adapt(itemStack.getType().createBlockData());
} else {
return BlockTypes.AIR.getDefaultState();
throw new NotABlockException();
}
}

View File

@ -149,7 +149,7 @@ public class BukkitServerInterface implements MultiUserPlatform {
@Override
public String getPlatformName() {
return "Bukkit-Official";
return "bukkit";
}
@Override

View File

@ -1,6 +1,6 @@
name: WorldEdit
main: com.sk89q.worldedit.bukkit.WorldEditPlugin
version: "${internalVersion}"
version: "${version}"
api-version: 1.13
description: Fast Async WorldEdit plugin
authors: [Empire92]