Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.

Commit 7bf7042

Browse files
committed
Merge remote-tracking branch 'origin/master' into 11-multi-proxy-support-for-load-balancing-and-scalability
2 parents 39c6f6d + dcefbbc commit 7bf7042

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

AGENTS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Coding Guidelines for surf-cloud
2+
3+
- Use Kotlin (with some Java) standard style: 4-space indentation, no trailing whitespace, end files with a newline.
4+
- Keep commit messages short (50 characters or less) and in the imperative mood.
5+
- After modifying any code, run `./gradlew build` in the repository root. The build must succeed before committing.
6+
- Summarise changes in the PR body and mention build results.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ https://chatgpt.com/g/g-67f7a61dc2208191bea4663d0771d6dd-flyway-migration-genera
3131
- [ ] codestyle settings (only for java if anyone would ever use that)
3232
- [ ] configure dokka
3333
- [ ] configure gitlab ci
34-
- [ ] configure gitingore
34+
- [ ] configure gitignore
3535
- [ ] basic project structure
3636
- [ ] Generators
3737
- [ ] packet id generator (one class where all packet ids are stored, annotated with @PacketIdStore)

gradlew

100644100755
File mode changed.

surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitClientCloudPlayerImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class BukkitClientCloudPlayerImpl(uuid: UUID, name: String) : ClientCloudPlayerI
3939
val player = audience ?: return
4040

4141
val factory = ConversationFactory(plugin)
42-
factory.withModality(true) // player dont receive messages from other players
43-
factory.withLocalEcho(false) // player dont see their own messages
42+
factory.withModality(true) // player doesn't receive messages from other players
43+
factory.withLocalEcho(false) // player doesn't see their own messages
4444
factory.withPrefix { ">> " } // prefix for messages
4545
factory.withTimeout(60) // timeout in seconds
4646
factory.withEscapeSequence("exit") // escape sequence to exit conversation

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/CommandManagerImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class CommandManagerImpl {
116116
} catch (e: CommandSyntaxException) {
117117
source.sendFailure(buildText {
118118
color(Colors.ERROR)
119-
appendText(e.message!!)
119+
appendText(e.message ?: e.javaClass.name)
120120
clickEvent(ClickEvent.suggestCommand("/$label"))
121121
})
122122

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/timeout/ReentrantRedWriteLockQueueTimeoutRegistry.kt renamed to surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/timeout/ReentrantReadWriteLockQueueTimeoutRegistry.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlin.concurrent.write
1111

1212

1313
@Component
14-
class ReentrantRedWriteLockQueueTimeoutRegistry : QueueTimeoutRegistry {
14+
class ReentrantReadWriteLockQueueTimeoutRegistry : QueueTimeoutRegistry {
1515
private val map = mutableObject2LongMapOf<UUID>().apply { defaultReturnValue(-1) }
1616
private val lock = ReentrantReadWriteLock()
1717

@@ -28,4 +28,4 @@ class ReentrantRedWriteLockQueueTimeoutRegistry : QueueTimeoutRegistry {
2828
lock.write { expired.forEach { map.removeLong(it) } }
2929
return expired
3030
}
31-
}
31+
}

0 commit comments

Comments
 (0)