Rebase the MessageHandler, MessageHandlerChain and MessageHandlerChainSet

Rebased several other pieces of code
This commit is contained in:
atomicint
2015-03-29 12:52:55 -04:00
parent 7f345fffac
commit 654a1a6dfd
71 changed files with 452 additions and 457 deletions
@@ -11,7 +11,7 @@ java_import 'org.apollo.game.model.entity.Player'
# Processes an add friend message, updating the logged-in status of the player (and the person they added) if necessary.
on :message, :add_friend do |ctx, player, message|
on :message, :add_friend do |player, message|
friend_username = message.username
player_username = player.username
@@ -30,7 +30,7 @@ on :message, :add_friend do |ctx, player, message|
end
# Processes a remove friend message, updating the logged-in status of the player if necessary.
on :message, :remove_friend do |ctx, player, message|
on :message, :remove_friend do |player, message|
friend_username = message.username
player_username = player.username
@@ -1,9 +1,9 @@
on :message, :add_ignore do |ctx, player, message|
on :message, :add_ignore do |player, message|
username = message.username
player.add_ignore(username)
end
on :message, :remove_ignore do |ctx, player, message|
on :message, :remove_ignore do |player, message|
username = message.username
player.remove_ignore(username)
end
@@ -4,7 +4,7 @@ java_import 'org.apollo.game.message.impl.ForwardPrivateChatMessage'
java_import 'org.apollo.game.model.World'
java_import 'org.apollo.game.model.entity.setting.PrivacyState'
on :message, :private_chat do |ctx, player, message|
on :message, :private_chat do |player, message|
friend = $world.get_player(message.username)
friend.send(ForwardPrivateChatMessage.new(player.username, player.privilege_level, message.compressed_chat)) if interaction_permitted(player, friend)
end