Skip to content

Commit e5c1a97

Browse files
committed
Push new version 1.4.9.2 change with updating player names before caching.
1 parent 3d8fa3a commit e5c1a97

5 files changed

Lines changed: 24 additions & 28 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Plugin Settings
22
plugin_name=LiteEco
3-
plugin_version=1.4.9.1-SNAPSHOT
3+
plugin_version=1.4.9.2-SNAPSHOT
44
plugin_description=LiteEco is an economy plugin using VaultAPI
55

66
#Server Dependency

src/main/kotlin/com/github/encryptsl/lite/eco/api/interfaces/PlayerSQL.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import java.util.concurrent.CompletableFuture
77

88
interface PlayerSQL {
99
fun createPlayerAccount(username: String, uuid: UUID, currency: String, money: BigDecimal)
10+
fun updatePlayerName(uuid: UUID, username: String, currency: String)
1011
fun getUserByUUID(uuid: UUID, currency: String): CompletableFuture<User>
11-
fun setPlayerNames(currency: String)
1212
fun deletePlayerAccount(uuid: UUID, currency: String)
1313
fun getExistPlayerAccount(uuid: UUID, currency: String): CompletableFuture<Boolean>
1414
fun getTopBalance(currency: String): MutableMap<String, User>

src/main/kotlin/com/github/encryptsl/lite/eco/common/database/models/DatabaseEcoModel.kt

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@ class DatabaseEcoModel : PlayerSQL {
3333
}
3434
}
3535

36+
override fun updatePlayerName(uuid: UUID, username: String, currency: String) {
37+
loggedTransaction {
38+
try {
39+
val table = Account(currency)
40+
table.update ({ table.uuid eq uuid }) {
41+
}
42+
} catch (e : ExposedSQLException) {
43+
LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
44+
}
45+
}
46+
}
47+
3648
override fun getUserByUUID(uuid: UUID, currency: String): CompletableFuture<User> {
3749
val future = CompletableFuture<User>()
3850
loggedTransaction {
@@ -53,22 +65,6 @@ class DatabaseEcoModel : PlayerSQL {
5365
return future
5466
}
5567

56-
override fun setPlayerNames(currency: String) {
57-
val offlinePlayers = Bukkit.getOfflinePlayers()
58-
for (player in offlinePlayers) {
59-
loggedTransaction {
60-
try {
61-
val table = Account(currency)
62-
table.update({ table.uuid eq player.uniqueId }) {
63-
it[username] = player.name.toString()
64-
}
65-
} catch (e : ExposedSQLException) {
66-
LiteEco.instance.logger.severe(e.message ?: e.localizedMessage)
67-
}
68-
}
69-
}
70-
}
71-
7268
override fun deletePlayerAccount(uuid: UUID, currency: String) {
7369
loggedTransaction {
7470
try {

src/main/kotlin/com/github/encryptsl/lite/eco/listeners/AccountManageListener.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ class AccountManageListener(private val liteEco: LiteEco) : Listener {
2121
}
2222
OperationType.CACHING_ACCOUNT -> {
2323
for (currency in liteEco.currencyImpl.getCurrenciesKeys()) {
24-
liteEco.databaseEcoModel.getUserByUUID(player.uniqueId, currency)
25-
.thenAccept { liteEco.api.cacheAccount(player, currency, it.money) }
24+
liteEco.databaseEcoModel.getUserByUUID(player.uniqueId, currency).thenApply {
25+
liteEco.databaseEcoModel.updatePlayerName(it.uuid, player.name.toString(), currency)
26+
27+
return@thenApply it
28+
}.thenAccept {
29+
liteEco.api.cacheAccount(player, currency, it.money)
30+
}
2631
}
2732
}
2833
OperationType.SYNC_ACCOUNT -> liteEco.api.syncAccount(player)

src/main/kotlin/com/github/encryptsl/lite/eco/utils/PlayerUtils.kt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,15 @@ package com.github.encryptsl.lite.eco.utils
22

33
import org.bukkit.Bukkit
44
import org.bukkit.OfflinePlayer
5-
import org.bukkit.entity.Entity
6-
import java.util.Optional
7-
import java.util.UUID
5+
import org.bukkit.entity.Player
6+
import java.util.*
87

98
object PlayerUtils {
109
fun getOfflinePlayer(uuid: UUID): OfflinePlayer {
1110
return Bukkit.getPlayer(uuid) ?: Bukkit.getOfflinePlayer(uuid)
1211
}
1312

1413
fun getUniqueId(offlinePlayer: OfflinePlayer): UUID {
15-
return Optional.ofNullable(offlinePlayer.getPlayer()).map(Entity::getUniqueId).orElseGet(offlinePlayer::getUniqueId)
16-
}
17-
18-
fun getUniqueId(player: String): UUID {
19-
return getUniqueId(Bukkit.getOfflinePlayer(player))
14+
return Optional.ofNullable(offlinePlayer.player).map(Player::getUniqueId).orElseGet(offlinePlayer::getUniqueId)
2015
}
2116
}

0 commit comments

Comments
 (0)