From c71536d1314600454f5311875bf641e9ed64a4a8 Mon Sep 17 00:00:00 2001 From: RadBuilder Date: Fri, 30 Jun 2017 00:58:19 -0700 Subject: [PATCH] Fixed TreasureChests without an economy Fixed an issue where it was assumed that the user is using an economy with Vault when installed. --- build.gradle | 2 +- .../isach/ultracosmetics/treasurechests/TreasureRandomizer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index cdb01467e..da879f2ae 100644 --- a/build.gradle +++ b/build.gradle @@ -1 +1 @@ -allprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' group = 'be.isach' version = '2.4.8-RELEASE' compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 targetCompatibility = 1.8 configurations { shaded compile.extendsFrom shaded } afterEvaluate { jar { dependsOn configurations.shaded from configurations.shaded.collect { it.isDirectory() ? it : zipTree(it) } } } } boolean local = false if (local) libsDirName = '/Users/sacha/Documents/Development/Java/UC_1_11/testserver/plugins' dependencies { subprojects.each { p -> shaded(p) { transitive false } } } subprojects { repositories { mavenLocal() mavenCentral() // Vault maven { url 'http://nexus.hc.to/content/repositories/pub_releases' } // Lib's Disguises maven { url 'http://repo.md-5.net/content/groups/public/' } // Spigot maven { url 'http://repo.isach.be' } // BungeeCord maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } } \ No newline at end of file +allprojects { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' group = 'be.isach' version = '2.4.9-RELEASE' compileJava.options.encoding = 'UTF-8' sourceCompatibility = 1.8 targetCompatibility = 1.8 configurations { shaded compile.extendsFrom shaded } afterEvaluate { jar { dependsOn configurations.shaded from configurations.shaded.collect { it.isDirectory() ? it : zipTree(it) } } } } boolean local = false if (local) libsDirName = '/Users/sacha/Documents/Development/Java/UC_1_11/testserver/plugins' dependencies { subprojects.each { p -> shaded(p) { transitive false } } } subprojects { repositories { mavenLocal() mavenCentral() // Vault maven { url 'http://nexus.hc.to/content/repositories/pub_releases' } // Lib's Disguises maven { url 'http://repo.md-5.net/content/groups/public/' } // Spigot maven { url 'http://repo.isach.be' } // BungeeCord maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } } \ No newline at end of file diff --git a/core/src/main/java/be/isach/ultracosmetics/treasurechests/TreasureRandomizer.java b/core/src/main/java/be/isach/ultracosmetics/treasurechests/TreasureRandomizer.java index 385765461..6141bbb00 100755 --- a/core/src/main/java/be/isach/ultracosmetics/treasurechests/TreasureRandomizer.java +++ b/core/src/main/java/be/isach/ultracosmetics/treasurechests/TreasureRandomizer.java @@ -368,7 +368,7 @@ public void clear() { } public void giveNothing() { - if (UltraCosmeticsData.get().getPlugin().isVaultLoaded()) { + if (UltraCosmeticsData.get().isUsingVaultEconomy()) { try { giveMoney(); } catch (Exception e) {