Merge branch 'master' of https://github.com/apollo-rsps/apollo.

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

@@ -1,6 +1,7 @@
 require 'java'
 
 java_import 'org.apollo.game.message.impl.FriendServerStatusMessage'
+java_import 'org.apollo.game.message.impl.IgnoreListMessage'
 java_import 'org.apollo.game.message.impl.SendFriendMessage'
 java_import 'org.apollo.game.model.World'
 java_import 'org.apollo.game.model.setting.ServerStatus'
@@ -8,6 +9,7 @@ java_import 'org.apollo.game.model.setting.PrivacyState'
 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|
   friend_username = message.username
@@ -86,4 +88,4 @@ end
 def viewable?(player, other_username)
   privacy = player.friend_privacy
   return privacy != PrivacyState::OFF && player.friends_with(other_username) || privacy == PrivacyState::ON
-end
+end

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

@@ -6,4 +6,4 @@ end
 on :message, :remove_ignore do |ctx, player, message|
   username = message.username
   player.remove_ignore(username)
-end
+end