Browse Source

More bad variable names.

GJ 13 years ago
parent
commit
cda3675dc5

+ 2 - 2
src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java

@@ -20,9 +20,9 @@ public class McmmoCommand implements CommandExecutor {
 
         if (Config.getInstance().getDonateMessageEnabled()) {
             if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
-                SpoutPlayer sPlayer = (SpoutPlayer) sender;
+                SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
 
-                sPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
+                spoutPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
             }
 
             sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");

+ 3 - 3
src/main/java/com/gmail/nossr50/skills/repair/Repair.java

@@ -254,10 +254,10 @@ public class Repair {
 
         if (!profile.getPlacedAnvil()) {
             if (mcMMO.spoutEnabled) {
-                SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+                SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
 
-                if (sPlayer.isSpoutCraftEnabled()) {
-                    sPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to repair!", Material.getMaterial(anvilID)); //TODO: Use Locale
+                if (spoutPlayer.isSpoutCraftEnabled()) {
+                    spoutPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to repair!", Material.getMaterial(anvilID)); //TODO: Use Locale
                 }
             }
             else {

+ 9 - 9
src/main/java/com/gmail/nossr50/spout/SpoutSounds.java

@@ -19,10 +19,10 @@ public class SpoutSounds {
      * @param location The location the sound should come from
      */
     public static void playSoundForPlayer(SoundEffect effect, Player player, Location location) {
-        SoundManager SM = SpoutManager.getSoundManager();
-        SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+        SoundManager soundManager = SpoutManager.getSoundManager();
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
 
-        SM.playSoundEffect(sPlayer, effect, location);
+        soundManager.playSoundEffect(spoutPlayer, effect, location);
     }
 
     /**
@@ -31,11 +31,11 @@ public class SpoutSounds {
      * @param player The player who repaired an item
      */
     public static void playRepairNoise(Player player, mcMMO plugin) {
-        SoundManager SM = SpoutManager.getSoundManager();
-        SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+        SoundManager soundManager = SpoutManager.getSoundManager();
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
 
         //If this is pulling from online, why have it in the jar?
-        SM.playCustomSoundEffect(plugin, sPlayer, "repair.wav", false);
+        soundManager.playCustomSoundEffect(plugin, spoutPlayer, "repair.wav", false);
     }
 
     /**
@@ -44,10 +44,10 @@ public class SpoutSounds {
      * @param player The player who leveled up
      */
     protected static void playLevelUpNoise(Player player, mcMMO plugin) {
-        SoundManager SM = SpoutManager.getSoundManager();
-        SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+        SoundManager soundManager = SpoutManager.getSoundManager();
+        SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
 
         //If this is pulling from online, why have it in the jar?
-        SM.playCustomSoundEffect(plugin, sPlayer, "level.wav", false);
+        soundManager.playCustomSoundEffect(plugin, spoutPlayer, "level.wav", false);
     }
 }

+ 5 - 5
src/main/java/com/gmail/nossr50/spout/SpoutStuff.java

@@ -199,10 +199,10 @@ public class SpoutStuff {
      * Handle level-up notifications through Spout.
      *
      * @param skillType The skill that leveled up
-     * @param sPlayer The player that leveled up
+     * @param spoutPlayer The player that leveled up
      */
-    public static void levelUpNotification(SkillType skillType, SpoutPlayer sPlayer) {
-        PlayerProfile profile = Users.getProfile(sPlayer);
+    public static void levelUpNotification(SkillType skillType, SpoutPlayer spoutPlayer) {
+        PlayerProfile profile = Users.getProfile(spoutPlayer);
         int notificationTier = getNotificationTier(profile.getSkillLevel(skillType));
         Material mat = null;
 
@@ -519,8 +519,8 @@ public class SpoutStuff {
         }
 
         //TODO: Use Locale
-        sPlayer.sendNotification(ChatColor.GREEN + "Level Up!", ChatColor.YELLOW + Misc.getCapitalized(skillType.toString()) + ChatColor.DARK_AQUA + " (" + ChatColor.GREEN + profile.getSkillLevel(skillType) + ChatColor.DARK_AQUA + ")", mat);
-        SpoutSounds.playLevelUpNoise(sPlayer, plugin);
+        spoutPlayer.sendNotification(ChatColor.GREEN + "Level Up!", ChatColor.YELLOW + Misc.getCapitalized(skillType.toString()) + ChatColor.DARK_AQUA + " (" + ChatColor.GREEN + profile.getSkillLevel(skillType) + ChatColor.DARK_AQUA + ")", mat);
+        SpoutSounds.playLevelUpNoise(spoutPlayer, plugin);
     }
 
     /**

+ 6 - 6
src/main/java/com/gmail/nossr50/util/Skills.java

@@ -229,18 +229,18 @@ public class Skills {
 
             /* Spout Stuff */
             if (mcMMO.spoutEnabled && player instanceof SpoutPlayer) {
-                SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+                SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
 
-                if (sPlayer.isSpoutCraftEnabled()) {
+                if (spoutPlayer.isSpoutCraftEnabled()) {
                     if (SpoutConfig.getInstance().getXPBarEnabled()) {
                         profile.updateXpBar();
                     }
 
-                    SpoutStuff.levelUpNotification(skillType, sPlayer);
+                    SpoutStuff.levelUpNotification(skillType, spoutPlayer);
 
                     /* Update custom titles */
                     if (SpoutConfig.getInstance().getShowPowerLevel()) {
-                        sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE + "." + ChatColor.GREEN + String.valueOf(profile.getPowerLevel()));
+                        spoutPlayer.setTitle(spoutPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE + "." + ChatColor.GREEN + String.valueOf(profile.getPowerLevel()));
                     }
                 }
                 else {
@@ -254,8 +254,8 @@ public class Skills {
 
         /* Always update XP Bar (Check if no levels were gained first to remove redundancy) */
         if (skillups == 0 && mcMMO.spoutEnabled && player instanceof SpoutPlayer) {
-            SpoutPlayer sPlayer = (SpoutPlayer) player;
-            if (sPlayer.isSpoutCraftEnabled()) {
+            SpoutPlayer spoutPlayer = (SpoutPlayer) player;
+            if (spoutPlayer.isSpoutCraftEnabled()) {
                 if (SpoutConfig.getInstance().getXPBarEnabled()) {
                     profile.updateXpBar();
                 }