Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking

Browse Source
This commit is contained in:
Jesse Boyd
2019-04-20 00:47:32 +10:00
parent 274c52163b e9048c3913
commit c56ba112d1
162 changed files with 3646 additions and 7453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
worldedit-bukkit/build.gradle
View File

@ -34,14 +34,13 @@ dependencies {
}
processResources {
from (sourceSets.main.resources.srcDirs) {
expand 'internalVersion': project.internalVersion
from('src/main/resources') {
expand(
name: project.parent.name,
version: project.parent.version
)
include 'plugin.yml'
}
from (sourceSets.main.resources.srcDirs) {
exclude 'plugin.yml'
}
}
jar.archiveName="fawe-bukkit-${project.parent.version}.jar"

4
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
View File

@ -302,7 +302,7 @@ public class FaweBukkit implements IFawe, Listener {
try {
this.vault = new VaultUtil();
} catch (final Throwable e) {
this.debug("&dVault is used for persistent `/wea` toggles.");
this.debug(BBC.getPrefix() + "&dVault is used for persistent `/wea` toggles.");
}
}
@ -310,7 +310,7 @@ public class FaweBukkit implements IFawe, Listener {
public String getDebugInfo() {
StringBuilder msg = new StringBuilder();
List<String> pl = new ArrayList<>();
msg.append("server.version: " + Bukkit.getVersion() + " / " + Bukkit.getBukkitVersion() + "\n");
msg.append("server.version: " + Bukkit.getVersion() + "\n");
msg.append("Plugins: \n");
for (Plugin p : Bukkit.getPluginManager().getPlugins()) {
msg.append(" - " + p.getName() + ": " + p.getDescription().getVersion() + "\n");

2
worldedit-bukkit/src/main/resources/plugin.yml
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]