Removed Master/Apprentice chat spam, and more..

Began modifying party command, still a WIP and probably not working
properly. Modified locale for Taming messages to trim them shorter.

Changelog.txt

@@ -18,6 +18,7 @@ Version 1.3.00-dev
  - Changed chat logging for /p & /a
  - Changed Tree Feller to use per-use ArrayList
  - Prettied up new config files
+ - Removed Master/Apprentice chat notifications to reduce spam
  - Removed duplicate settings in config.yml
  - Removed unused settings from config.yml (HP Regen)
  - Removed Nether Brick from Mining XP Tables

src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java

@@ -11,6 +11,7 @@ import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 
@@ -73,6 +74,43 @@ public class PartyCommand implements CommandExecutor {
 			}
 			player.sendMessage(mcLocale.getString("mcPlayerListener.YouAreInParty", new Object[] { PP.getParty() }));
 			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyMembers") + " (" + tempList + ChatColor.GREEN + ")");
+			
+			//Master Apprentice Stuff
+			//Show the player all their bonuses when they type /party
+			for(Player a : Party.getInstance().getPartyMembers(player))
+			{
+			    if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && !a.getName().equals(player.getName()))
+			    {
+			        PlayerProfile LP = Users.getProfile(a);
+			        for(SkillType type : SkillType.values())
+			        {
+			            //Skip this one
+			            if(type == SkillType.ALL)
+			                continue;
+			            
+			            if(LP.getSkillLevel(type) > PP.getSkillLevel(type))
+			            {
+			                //Tell them what their skill bonus is for this skill
+        			        int leaderLevel = LP.getSkillLevel(type); 
+        		            int difference = leaderLevel - PP.getSkillLevel(type);
+        		            
+        		            double bonusModifier = (difference*0.75D)/100D;
+        		            double trueBonus = bonusModifier * 100;
+        		            player.sendMessage("You get "+trueBonus+"% more XP from "+type.toString());
+        		            //double percent = (trueBonus/100)*100;
+			            } else
+			            {
+			                //Tell them they have no bonus.. or not
+			            }
+			        }
+			    } else if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && a.getName().equals(player.getName()))
+			    {
+			        //Tell them they are providing bonuses
+			    }
+			}
+			
+            
+            
 			return true;
 		} else if (args.length == 1) {
 			if (args[0].equals("q") && PP.inParty()) {

src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java

@@ -903,7 +903,7 @@ public class PlayerProfile
 	}
 	
 	/**
-	 * Adds XP to the player, this is affected by skill modifiers
+	 * Adds XP to the player, this is affected by skill modifiers and xp rate
 	 * @param skillType The skill to add XP to
 	 * @param newvalue The amount of XP to add
 	 */
@@ -997,7 +997,7 @@ public class PlayerProfile
 				double oldxp = xp;
 				xp+=trueBonus;
 				double percent = (trueBonus/oldxp)*100;
-				thisplayer.sendMessage(ChatColor.GREEN+"XP: "+oldxp+" Bonus XP: "+trueBonus+" Total: "+xp+ChatColor.GOLD+" [Master: "+leaderName+" " +" +"+(int)percent+"%]");
+				//thisplayer.sendMessage(ChatColor.GREEN+"XP: "+oldxp+" Bonus XP: "+trueBonus+" Total: "+xp+ChatColor.GOLD+" [Master: "+leaderName+" " +" +"+(int)percent+"%]");
 			}
 			Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(Bukkit.getPlayer(playerName), skillType, xp));
 			skillsXp.put(skillType, skillsXp.get(skillType)+xp);

src/main/resources/locale/locale_de.properties

@@ -396,8 +396,8 @@ m.EffectsTaming7_0=[[YELLOW]]Ruf der Wildniss
 m.EffectsTaming7_1=[[AQUA]]Beschwoere einen Wolf auf deine Seite
 m.EffectsTaming7_2=[[YELLOW]]Info: [[AQUA]]Ducken und Rechtsklick mit {0} Knochen in der Hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_en_us.properties

@@ -389,8 +389,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_es_es.properties

@@ -389,8 +389,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_fi.properties

@@ -368,8 +368,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_fr.properties

@@ -389,8 +389,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_nl.properties

@@ -395,8 +395,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_pl.properties

@@ -389,8 +389,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_pt_br.properties

@@ -399,8 +399,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!

src/main/resources/locale/locale_ru.properties

@@ -381,8 +381,8 @@ m.EffectsTaming7_0=Call of the Wild
 m.EffectsTaming7_1=Summon a wolf to your side
 m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones in hand
 m.EffectsTaming8_0=Fast Food Service
-m.EffectsTaming8_1=Chance for wolves to heal when they attack
+m.EffectsTaming8_1=Chance for wolves to heal on attack
 m.AbilLockTaming5=LOCKED UNTIL 50+ SKILL (FAST FOOD SERVICE)
 m.AbilBonusTaming5_0=Fast Food Service
-m.AbilBonusTaming5_1=50% Chance to heal equivalent to damage dealt
+m.AbilBonusTaming5_1=50% Chance for heal on attack
 Swords.StoppedBleeding=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!