diff options
author | Dico <dico.karssiens@gmail.com> | 2018-08-02 03:42:48 +0100 |
---|---|---|
committer | Dico <dico.karssiens@gmail.com> | 2018-08-02 03:42:48 +0100 |
commit | 6513ad9237dbda0244a52608ae639fee5822b3ee (patch) | |
tree | 1cde86912f1131d7a318687a8fcca9ba9b2f568a /src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt | |
parent | 3917855a72c60d1c78632949b4fea21471873347 (diff) |
Fix bugs
Diffstat (limited to 'src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt')
-rw-r--r-- | src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt b/src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt index 2cee99a..f712d00 100644 --- a/src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt +++ b/src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt @@ -4,10 +4,10 @@ import io.dico.dicore.command.CommandException import io.dico.dicore.command.ExecutionContext import io.dico.dicore.command.ICommandReceiver import io.dico.parcels2.ParcelOwner +import io.dico.parcels2.ParcelWorld import io.dico.parcels2.ParcelsPlugin import io.dico.parcels2.util.hasAdminManage import io.dico.parcels2.util.parcelLimit -import io.dico.parcels2.util.uuid import org.bukkit.entity.Player import org.bukkit.plugin.Plugin import java.lang.reflect.Method @@ -29,9 +29,10 @@ abstract class AbstractParcelCommands(val plugin: ParcelsPlugin) : ICommandRecei if (!plugin.storage.isConnected) error("Parcels cannot $action right now because of a database error") } - protected suspend fun checkParcelLimit(player: Player) { + protected suspend fun checkParcelLimit(player: Player, world: ParcelWorld) { if (player.hasAdminManage) return - val numOwnedParcels = plugin.storage.getNumParcels(ParcelOwner(uuid = player.uuid)).await() + val numOwnedParcels = plugin.storage.getOwnedParcels(ParcelOwner(player)).await() + .filter { it.world.world == world.world }.size val limit = player.parcelLimit if (numOwnedParcels >= limit) { |