Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-19 14:59:19 +00:00
Code Issues Releases Activity

Fix events being called async in discovery commands

Browse Source
This commit is contained in:
SamB440
2025-12-03 14:17:23 +00:00
parent 67c71ef1f0
commit 84f2383483
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/main/java/net/islandearth/rpgregions/managers/data/account/RPGRegionsAccount.java
View File

@@ -55,7 +55,6 @@ public class RPGRegionsAccount {
}
public TimeEntry addTimeEntryInRegion(String region, long time) {
System.out.println("added time entry: " + region + ", " + time);
final TimeEntry timeEntry = new TimeEntry(time);
secondsInRegion.put(region, timeEntry);
return timeEntry;

2
build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
View File

@@ -60,7 +60,7 @@ repositories {
}
project.group = "net.islandearth.rpgregions"
project.version = "1.4.94"
project.version = "1.4.95"
group = project.group
version = project.version

46
rpgregions/src/main/java/net/islandearth/rpgregions/commands/DiscoveriesCommand.java
View File

@@ -115,17 +115,19 @@ public class DiscoveriesCommand {
@Argument("region") ConfiguredRegion configuredRegion,
@Argument("player") OfflinePlayer target) {
plugin.getManagers().getStorageManager().getAccount(target.getUniqueId()).thenAcceptAsync(account -> {
LocalDateTime date = LocalDateTime.now();
final WorldDiscovery worldDiscovery = new WorldDiscovery(date, configuredRegion.getId());
account.addDiscovery(worldDiscovery);
if (target.getPlayer() != null) {
Player player = target.getPlayer();
player.sendMessage(ChatColor.GREEN + "An administrator added a discovery to your account.");
Bukkit.getPluginManager().callEvent(new RegionDiscoverEvent(player, account, configuredRegion, worldDiscovery));
}
plugin.getManagers().getStorageManager().removeCachedAccount(target.getUniqueId());
plugin.getScheduler().executeOnMain(() -> {
LocalDateTime date = LocalDateTime.now();
final WorldDiscovery worldDiscovery = new WorldDiscovery(date, configuredRegion.getId());
account.addDiscovery(worldDiscovery);
if (target.getPlayer() != null) {
Player player = target.getPlayer();
player.sendMessage(ChatColor.GREEN + "An administrator added a discovery to your account.");
Bukkit.getPluginManager().callEvent(new RegionDiscoverEvent(player, account, configuredRegion, worldDiscovery));
}
plugin.getManagers().getStorageManager().removeCachedAccount(target.getUniqueId());
sender.sendMessage(ChatColor.GREEN + "The player " + target.getName() + " has had the discovery added.");
sender.sendMessage(ChatColor.GREEN + "The player " + target.getName() + " has had the discovery added.");
});
}).exceptionally((err) -> {
err.printStackTrace();
sender.sendMessage(ChatColor.RED + "An error occurred, please check console and report this to the developer.");
@@ -140,18 +142,20 @@ public class DiscoveriesCommand {
@Argument("fauna") FaunaInstance<?> fauna,
@Argument("player") OfflinePlayer target) {
plugin.getManagers().getStorageManager().getAccount(target.getUniqueId()).thenAccept(account -> {
LocalDateTime date = LocalDateTime.now();
final WorldDiscovery worldDiscovery = new WorldDiscovery(date, fauna.getIdentifier());
account.addDiscovery(worldDiscovery);
if (target.getPlayer() != null) {
Player player = target.getPlayer();
final FaunaDiscoverEvent event = new FaunaDiscoverEvent(player, fauna, worldDiscovery);
Bukkit.getPluginManager().callEvent(event);
player.sendMessage(ChatColor.GREEN + "An administrator added a discovery to your account.");
}
plugin.getManagers().getStorageManager().removeCachedAccount(target.getUniqueId());
plugin.getScheduler().executeOnMain(() -> {
LocalDateTime date = LocalDateTime.now();
final WorldDiscovery worldDiscovery = new WorldDiscovery(date, fauna.getIdentifier());
account.addDiscovery(worldDiscovery);
if (target.getPlayer() != null) {
Player player = target.getPlayer();
final FaunaDiscoverEvent event = new FaunaDiscoverEvent(player, fauna, worldDiscovery);
Bukkit.getPluginManager().callEvent(event);
player.sendMessage(ChatColor.GREEN + "An administrator added a discovery to your account.");
}
plugin.getManagers().getStorageManager().removeCachedAccount(target.getUniqueId());
sender.sendMessage(ChatColor.GREEN + "The player " + target.getName() + " has had the discovery added.");
sender.sendMessage(ChatColor.GREEN + "The player " + target.getName() + " has had the discovery added.");
});
}).exceptionally((err) -> {
err.printStackTrace();
sender.sendMessage(ChatColor.RED + "An error occurred, please check console and report this to the developer.");