Skip to content

Fix offlineplayer issues #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cerqiest wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix offlineplayer issues #40

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b1cad5
fix: property issues in offlineplayer
cerqiest Apr 21, 2025
babd167
fix: additional property issues in offlineplayer
cerqiest Apr 21, 2025
9d678cf
refactor: remove useless type annotation
cerqiest Apr 21, 2025
452b270
refactor: change property names to remove `is` prefix to be consisten…
cerqiest Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions src/main/kotlin/dev/znci/rocket/scripting/globals/tables/Players.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package dev.znci.rocket.scripting.globals.tables

import dev.znci.rocket.scripting.PermissionsManager
import dev.znci.rocket.scripting.annotations.Global
import dev.znci.rocket.scripting.api.RocketError
import dev.znci.rocket.util.MessageFormatter
import dev.znci.twine.TwineNative
import dev.znci.twine.TwineTable
Expand Down Expand Up @@ -97,7 +96,7 @@ data class TitleTimeTable(

@Suppress("unused")
class LuaPlayer(
override val player: Player
val player: Player
) : LuaOfflinePlayer(player) {
@TwineNativeFunction
fun send(message: Any): Boolean {
Expand Down Expand Up @@ -275,7 +274,7 @@ open class LuaOfflinePlayer(val offlinePlayer: OfflinePlayer) : TwineNative("")

@TwineNativeProperty
val lastDeathLocation
get() = offlinePlayer.lastDeathLocation
get() = offlinePlayer.lastDeathLocation?.let { LuaLocation.fromBukkit(it) }

@TwineNativeProperty
val lastLogin
Expand All @@ -288,27 +287,20 @@ open class LuaOfflinePlayer(val offlinePlayer: OfflinePlayer) : TwineNative("")
// location, name, and player are open because they are overridden in LuaPlayer with non-nullable values
// in the case of location and name and the actual player instance in the case of player
@TwineNativeProperty
open val location: LuaLocation?
get() {
val location = offlinePlayer.location
return if (location != null) {
LuaLocation.fromBukkit(location)
} else {
null
}
}
open val location
get() = offlinePlayer.location?.let { LuaLocation.fromBukkit(it) }
Copy link
Contributor

@zNotChill zNotChill Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surely this doesn't work since the player is offline...


@TwineNativeProperty
open val name
get() = offlinePlayer.name

@TwineNativeProperty
open val player
get() = offlinePlayer.player
@TwineNativeProperty("player")
open val playerLuaProperty
get() = offlinePlayer.player?.let { LuaPlayer(it) }
Copy link
Contributor

@zNotChill zNotChill Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question


@TwineNativeProperty
val respawnLocation
get() = offlinePlayer.respawnLocation
get() = offlinePlayer.respawnLocation?.let { LuaLocation.fromBukkit(it) }

@TwineNativeProperty
val uuid
Expand All @@ -319,15 +311,15 @@ open class LuaOfflinePlayer(val offlinePlayer: OfflinePlayer) : TwineNative("")
get() = offlinePlayer.hasPlayedBefore()

@TwineNativeProperty
val isBanned
val banned
get() = offlinePlayer.isBanned

@TwineNativeProperty
val isConnected
get() = offlinePlayer.isOnline
val connected
get() = offlinePlayer.isConnected

@TwineNativeProperty
val isOnline
val online
get() = offlinePlayer.isOnline

@TwineNativeProperty
Expand Down