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

Resolve merge conflict.

Browse Source
This commit is contained in:
Major-
2015-03-28 13:52:59 +00:00
parent 3bd3ddd226 29f6524d14
commit 1f2fde61a8
35 changed files with 202 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/plugins/chat/private-messaging/messaging.rb
+1 -1
View File
@@ -6,7 +6,7 @@ java_import 'org.apollo.game.model.entity.setting.PrivacyState'
on :message, :private_chat do |ctx, player, message|
friend = $world.get_player(message.username)
friend.send(ForwardPrivateChatMessage.new(player.username, player.privilege_level, message.compressed_message)) if interaction_permitted(player, friend)
friend.send(ForwardPrivateChatMessage.new(player.username, player.privilege_level, message.compressed_chat)) if interaction_permitted(player, friend)
end
# Checks if the sender is permitted to interact with the friend they have added: