Merge branch 'RPKit-147' into release/v1.0

RP-Kit · Jan 7, 2017 · a953c94 · a953c94
2 parents 674c8ce + 2a17e98
commit a953c94
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...aracters-bukkit/src/main/kotlin/com/rpkit/characters/bukkit/character/RPKCharacterImpl.kt b/...aracters-bukkit/src/main/kotlin/com/rpkit/characters/bukkit/character/RPKCharacterImpl.kt
@@ -17,8 +17,8 @@
 package com.rpkit.characters.bukkit.character
 
 import com.rpkit.characters.bukkit.RPKCharactersBukkit
-import com.rpkit.characters.bukkit.character.field.RPKCharacterCardFieldProvider
 import com.rpkit.characters.bukkit.character.field.HideableCharacterCardField
+import com.rpkit.characters.bukkit.character.field.RPKCharacterCardFieldProvider
 import com.rpkit.characters.bukkit.gender.RPKGender
 import com.rpkit.characters.bukkit.gender.RPKGenderProvider
 import com.rpkit.characters.bukkit.race.RPKRace
@@ -84,7 +84,8 @@ class RPKCharacterImpl constructor(
             if (offlineBukkitPlayer.isOnline) {
                 val bukkitPlayer = offlineBukkitPlayer.player
                 val characterCardFieldProvider = plugin.core.serviceManager.getServiceProvider(RPKCharacterCardFieldProvider::class)
-                for (line in plugin.config.getStringList("messages.character-card")) {
+                for (line in if (player == this.player) plugin.config.getStringList("messages.character-card-owner") else
+                    plugin.config.getStringList("messages.character-card-not-owner")) {
                     val message = FancyMessage("")
                     var chatColor: ChatColor? = null
                     var chatFormat: ChatColor? = null

diff --git a/bukkit/rpk-characters-bukkit/src/main/resources/config.yml b/bukkit/rpk-characters-bukkit/src/main/resources/config.yml
@@ -33,7 +33,7 @@ messages:
     character-unhide-name-valid: '&aName unhidden.'
     character-unhide-gender-valid: '&aGender unhidden.'
     character-unhide-race-valid: '&aRace unhidden.'
-    character-card:
+    character-card-owner:
     - '&7$name (&a&l$edit(name)&7/&a&l$hide(name)&7)'
     - '&7Player: &f$player'
     - '&7Gender: &f$gender &7(&a&l$edit(gender)&7/&a&l$hide(gender)&7)'
@@ -44,6 +44,17 @@ messages:
     - '&7Health: &f$health&7/&f$max-health'
     - '&7Food: &f$food&7/&f$max-food'
     - '&7Thirst: &f$thirst&7/&f$max-thirst'
+    character-card-not-owner:
+    - '&7$name'
+    - '&7Player: &f$player'
+    - '&7Gender: &f$gender'
+    - '&7Age: &f$age'
+    - '&7Race: &f$race'
+    - '&7Description: &f$description'
+    - '&7Dead: &f$dead'
+    - '&7Health: &f$health'
+    - '&7Food: &f$food&7/&f$max-food'
+    - '&7Thirst: &f$thirst&7/&f$max-thirst'
     character-list-title: '&fYour characters: '
     character-list-item: '&f- $character'
     character-switch-prompt: '&fWhat is the name of the character you would like to switch to? &7(Type cancel to cancel)'