Mirror von
https://github.com/TheSilentPro/HeadDB.git
synchronisiert 2024-12-26 19:02:39 +01:00
Fix economy
Dieser Commit ist enthalten in:
Ursprung
282a711dcb
Commit
d279c764d9
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,7 +3,6 @@ target/
|
|||||||
src/test/
|
src/test/
|
||||||
|
|
||||||
dependency-reduced-pom.xml
|
dependency-reduced-pom.xml
|
||||||
build.properties
|
|
||||||
build/
|
build/
|
||||||
|
|
||||||
.classpath
|
.classpath
|
||||||
|
2
pom.xml
2
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>tsp.headdb</groupId>
|
<groupId>tsp.headdb</groupId>
|
||||||
<artifactId>HeadDB</artifactId>
|
<artifactId>HeadDB</artifactId>
|
||||||
<version>5.0.0-rc.8</version>
|
<version>5.0.0-rc.9</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>HeadDB</name>
|
<name>HeadDB</name>
|
||||||
|
@ -15,6 +15,7 @@ public class CommandInfo extends SubCommand {
|
|||||||
public void handle(CommandSender sender, String[] args) {
|
public void handle(CommandSender sender, String[] args) {
|
||||||
if (HeadDB.getInstance().getConfig().getBoolean("showAdvancedPluginInfo")) {
|
if (HeadDB.getInstance().getConfig().getBoolean("showAdvancedPluginInfo")) {
|
||||||
PlayerUtils.sendMessage(sender, "&7Running &6HeadDB - " + Utils.getVersion().orElse(HeadDB.getInstance().getDescription().getVersion() + " &7(&4UNKNOWN SEMVER&7)"));
|
PlayerUtils.sendMessage(sender, "&7Running &6HeadDB - " + Utils.getVersion().orElse(HeadDB.getInstance().getDescription().getVersion() + " &7(&4UNKNOWN SEMVER&7)"));
|
||||||
|
//PlayerUtils.sendMessage(sender, "&7Build: " + HeadDB.getInstance().getDescription().getVersion());
|
||||||
PlayerUtils.sendMessage(sender, "&7GitHub: &6https://github.com/TheSilentPro/HeadDB");
|
PlayerUtils.sendMessage(sender, "&7GitHub: &6https://github.com/TheSilentPro/HeadDB");
|
||||||
} else {
|
} else {
|
||||||
PlayerUtils.sendMessage(sender, "&7Running &6HeadDB &7by &6TheSilentPro (Silent)");
|
PlayerUtils.sendMessage(sender, "&7Running &6HeadDB &7by &6TheSilentPro (Silent)");
|
||||||
|
@ -213,9 +213,7 @@ public class Utils {
|
|||||||
.replace("%cost%", HeadDB.getInstance().getDecimalFormat().format(cost))
|
.replace("%cost%", HeadDB.getInstance().getDecimalFormat().format(cost))
|
||||||
);
|
);
|
||||||
|
|
||||||
try (Promise<Boolean> economyPromise = optional.get().purchase(player, cost)) {
|
return optional.get().purchase(player, cost).thenApplyAsync(success -> {
|
||||||
// TODO: Might not need to be sync.
|
|
||||||
return economyPromise.thenApplySync((success) -> {
|
|
||||||
if (success) {
|
if (success) {
|
||||||
HeadDB.getInstance().getLocalization().sendMessage(player, "completePayment", msg -> msg
|
HeadDB.getInstance().getLocalization().sendMessage(player, "completePayment", msg -> msg
|
||||||
.replace("%name%", head.getName())
|
.replace("%name%", head.getName())
|
||||||
@ -225,17 +223,12 @@ public class Utils {
|
|||||||
}
|
}
|
||||||
return success;
|
return success;
|
||||||
});
|
});
|
||||||
} catch (Exception ex) {
|
|
||||||
HeadDB.getInstance().getLog().severe("Failed to process payment: " + ex.getMessage());
|
|
||||||
return Promise.exceptionally(ex);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void purchase(Player player, Head head, int amount) {
|
public static void purchase(Player player, Head head, int amount) {
|
||||||
// Bukkit API - Has to be sync.
|
// Bukkit API - Has to be sync.
|
||||||
try (Promise<Boolean> paymentPromise = processPayment(player, head, amount)) {
|
processPayment(player, head, amount).thenAcceptSync(success -> {
|
||||||
paymentPromise.thenAcceptSync((success) -> {
|
|
||||||
if (success) {
|
if (success) {
|
||||||
ItemStack item = head.getItem(player.getUniqueId());
|
ItemStack item = head.getItem(player.getUniqueId());
|
||||||
item.setAmount(amount);
|
item.setAmount(amount);
|
||||||
@ -252,9 +245,6 @@ public class Utils {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (Exception ex) {
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Optional<String> getTexture(ItemStack head) {
|
public static Optional<String> getTexture(ItemStack head) {
|
||||||
|
1
src/main/resources/build.properties
Normale Datei
1
src/main/resources/build.properties
Normale Datei
@ -0,0 +1 @@
|
|||||||
|
version=${project.version}
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren