Rebase the MessageHandler, MessageHandlerChain and MessageHandlerChainSet

Rebased several other pieces of code

data/plugins/chat/privacy/privacy.rb

@@ -3,7 +3,7 @@ require 'java'
 java_import 'org.apollo.game.model.entity.setting.PrivacyState'
 java_import 'org.apollo.game.message.impl.SendFriendMessage'
 
-on :message, :privacy_option do |ctx, player, message|
+on :message, :privacy_option do |player, message|
   player.chat_privacy = message.chat_privacy
   player.friend_privacy = message.friend_privacy
   player.trade_privacy = message.trade_privacy

data/plugins/chat/private-messaging/friend.rb

@@ -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
 

data/plugins/chat/private-messaging/ignore.rb

@@ -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

data/plugins/chat/private-messaging/messaging.rb

@@ -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