2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-05 00:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'world' object from global script scope

Browse Source
This commit is contained in:
Gary Tierney
2017-05-28 23:07:05 +01:00
parent 05e20d9d51
commit 48e1726bc0
7 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/plugins/chat/private-messaging/friends.plugin.kts
+9 -9
View File
@@ -3,21 +3,21 @@ import org.apollo.game.message.impl.SendFriendMessage
import org.apollo.game.model.entity.setting.PrivacyState
on { AddFriendMessage::class }
.then { player ->
player.addFriend(username)
.then {
it.addFriend(username)
val playerUsername = player.username
val friend = world.getPlayer(username)
val playerUsername = it.username
val friend = it.world.getPlayer(username)
if (friend == null) {
player.send(SendFriendMessage(username, 0))
it.send(SendFriendMessage(username, 0))
} else if (friend.friendsWith(playerUsername) || friend.friendPrivacy == PrivacyState.ON) {
if (player.friendPrivacy != PrivacyState.OFF) {
friend.send(SendFriendMessage(playerUsername, player.worldId))
if (it.friendPrivacy != PrivacyState.OFF) {
friend.send(SendFriendMessage(playerUsername, it.worldId))
}
if (friend.friendPrivacy != PrivacyState.OFF) {
player.send(SendFriendMessage(username, friend.worldId))
it.send(SendFriendMessage(username, friend.worldId))
}
}
}
}
game/src/plugins/chat/private-messaging/ignores.plugin.kts
+2 -2
View File
@@ -2,7 +2,7 @@ import org.apollo.game.message.impl.AddIgnoreMessage
import org.apollo.game.message.impl.RemoveIgnoreMessage
on { AddIgnoreMessage::class }
.then { player -> player.addIgnore(username) }
.then { it.addIgnore(username) }
on { RemoveIgnoreMessage::class }
.then { player -> player.removeIgnore(username) }
.then { it.removeIgnore(username) }