yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New server config option to preload the world map on boot, removes lag caused by lazy loading (server.preload_map = true)

Browse Source 
Cached region clipping flags for faster lookups
Minor optimizations to setAttribute codepath which avoids unnecessary checks
Fixed a bug that would allow entities to attack through walls
Fixed two separate bugs that would cause odd behavior attacking large entities from certain angles
Removed unnecessary schema from global.sql
Ensured that all but the `members` and `worlds` tables could be safely dropped out of the DB
Better automatic handling for creating the default server account and creating the default server clan
Fixed bugs related to interfaces flagged as uncloseable that would cause stack overflows
Fixed premature home teleport while in tutorial
Fixed getting stuck by going back up ladder in tutorial
Fixed bug that prevented bots from taking damage
Fixed a bug where players would not be in the default clan after completion of the tutorial
Green Dragon bots reintroduced, no longer buy any items (these bots sell loot from green dragons in the wilderness on the GE)
This commit is contained in:
Ceikry
2022-06-24 14:40:26 +00:00
committed by Ryan
parent 67e54d5429
commit ebf2ed4ab4
32 changed files with 495 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt
+1 -1
View File
@@ -106,7 +106,7 @@ class MajorUpdateWorker {
//remove all null or finished pulses from the list
rmlist.forEach {
if (GameWorld.Pulser.TASKS.contains(it)) GameWorld.Pulser.TASKS.remove(it)
GameWorld.Pulser.TASKS.remove(it)
}
rmlist.clear()
Server/src/main/kotlin/rs09/worker/ManagementEvents.kt
+60 -32
View File
@@ -30,6 +30,8 @@ import proto.management.SendClanInfo
import proto.management.SendClanInfo.ClanMember
import proto.management.SendContactInfo
import proto.management.SendContactInfo.Contact
import rs09.ServerConstants
import rs09.auth.UserAccountInfo
import rs09.game.system.SystemLogger
import rs09.game.world.GameWorld
import rs09.game.world.repository.Repository
@@ -262,40 +264,29 @@ object ManagementEvents {
is SendClanInfo -> {
if (event.hasInfo) {
val clan = ClanRepository.getClans().getOrPut(event.clanOwner) { ClanRepository(event.clanOwner) }
clan.name = event.clanName
clan.joinRequirement = ClanRank.values()[event.joinRequirement]
clan.kickRequirement = ClanRank.values()[event.kickRequirement]
clan.messageRequirement = ClanRank.values()[event.messageRequirement]
clan.lootRequirement = ClanRank.values()[event.lootRequirement]
for (member in event.membersList) {
val entry = ClanEntry(member.username, member.world)
clan.ranks[member.username] = ClanRank.values()[member.rank]
if (member.world == GameWorld.settings!!.worldId) {
val p = Repository.getPlayerByName(member.username)
entry.player = p
p?.communication?.clan = clan
}
clan.players.add(entry)
}
clan.update()
initializeClanFrom(event)
} else {
val info = GameWorld.accountStorage.getAccountInfo(event.clanOwner)
var info = GameWorld.accountStorage.getAccountInfo(event.clanOwner)
if (info.clanName.isNotEmpty()) {
val reqs = CommunicationInfo.parseClanRequirements(info.clanReqs)
val c = ClanRepository(event.clanOwner)
val contacts = CommunicationInfo.parseContacts(info.contacts)
c.name = info.clanName
c.joinRequirement = reqs[0]
c.messageRequirement = reqs[1]
c.kickRequirement = reqs[2]
c.lootRequirement = reqs[3]
for ((username, contact) in contacts) {
c.ranks[username] = contact.rank
initializeClanWith(info)
} else {
SystemLogger.logMS("Creating default server clan")
if (GameWorld.settings!!.enable_default_clan && event.clanOwner == ServerConstants.SERVER_NAME) {
//Create a user with the default clan and some basic settings and stick them in the account storage
if (info == UserAccountInfo.createDefault()) {
info.username = ServerConstants.SERVER_NAME
info.password = ServerConstants.MS_SECRET_KEY
info.rights = 2
SystemLogger.logAlert("Creating default server account: ${info.username}, password is your MS_SECRET_KEY!")
GameWorld.authenticator.createAccountWith(info)
info = GameWorld.accountStorage.getAccountInfo(event.clanOwner)
}
info.clanName = "Global"
info.clanReqs = "-1,-1,7,7" //Any join, any message, owner kick, owner loot
GameWorld.accountStorage.update(info)
initializeClanWith(info)
}
ClanRepository.getClans()[event.clanOwner] = c
}
}
@@ -323,7 +314,44 @@ object ManagementEvents {
}
}
private fun initializeClanFrom(event: SendClanInfo) {
val clan = ClanRepository.getClans().getOrPut(event.clanOwner) { ClanRepository(event.clanOwner) }
clan.name = event.clanName
clan.joinRequirement = ClanRank.values()[event.joinRequirement]
clan.kickRequirement = ClanRank.values()[event.kickRequirement]
clan.messageRequirement = ClanRank.values()[event.messageRequirement]
clan.lootRequirement = ClanRank.values()[event.lootRequirement]
for (member in event.membersList) {
val entry = ClanEntry(member.username, member.world)
clan.ranks[member.username] = ClanRank.values()[member.rank]
if (member.world == GameWorld.settings!!.worldId) {
val p = Repository.getPlayerByName(member.username)
entry.player = p
p?.communication?.clan = clan
}
clan.players.add(entry)
}
clan.update()
}
private fun initializeClanWith(info: UserAccountInfo) {
val reqs = CommunicationInfo.parseClanRequirements(info.clanReqs)
val c = ClanRepository(info.username)
val contacts = CommunicationInfo.parseContacts(info.contacts)
c.name = info.clanName
c.joinRequirement = reqs[0]
c.messageRequirement = reqs[1]
c.kickRequirement = reqs[2]
c.lootRequirement = reqs[3]
for ((username, contact) in contacts) {
c.ranks[username] = contact.rank
}
ClanRepository.getClans()[info.username] = c
}
private fun queueUntilClanInfo(clanName: String, message: Message) {
val queue = waitingOnClanInfo.getOrPut(clanName) {LinkedList()}
queue.offer(message)