JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

Browse Source
This commit is contained in:
Chiss 2014-08-27 14:23:01 +10:00
commit 596bcbfae6
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java
View File

@ -70,7 +70,7 @@ public class AchievementPage extends ShopPageBase<AchievementManager, Achievemen
}
{
Material material = hasUnlocked ? Material.EMERALD : Material.INK_SACK;
Material material = hasUnlocked ? Material.EXP_BOTTLE : Material.GLASS_BOTTLE;
String itemName = (hasUnlocked ? C.cGreen : C.cRed) + achievement.getName();
if (!singleLevel)
@ -103,7 +103,7 @@ public class AchievementPage extends ShopPageBase<AchievementManager, Achievemen
}
AddItem(currentIndex, new ShopItem(material, (byte) (hasUnlocked ? 0 : 1), itemName, lore.toArray(new String[0]), 1, false, false));
AddItem(currentIndex, new ShopItem(material, (byte) (hasUnlocked ? 0 : 0), itemName, lore.toArray(new String[0]), 1, false, false));
}
masterAchievementLore.add((hasUnlocked ? C.cGreen : C.cRed) + achievement.getName());

20
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java
View File

@ -518,15 +518,7 @@ public class SheepGame extends TeamGame
//Write New
for (GameTeam team : _sheepPens.keySet())
{
int score = 0;
for (Sheep sheep : _sheep.keySet())
{
if (_sheepPens.get(team).contains(sheep.getLocation().getBlock()))
{
score++;
}
}
int score = getSheepCount(team);
Scoreboard.WriteOrdered("Sheep", team.GetColor() + team.GetName(), score, true);
@ -682,14 +674,14 @@ public class SheepGame extends TeamGame
public int getSheepCount(GameTeam team)
{
int count = 0;
int score = 0;
for (SheepData data : _sheep.values())
for (Sheep sheep : _sheep.keySet())
{
if (data.HolderTeam == team)
count++;
if (_sheepPens.get(team).contains(sheep.getLocation().getBlock()))
score++;
}
return count;
return score;
}
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ParalympicsStatTracker.java
View File

@ -23,7 +23,7 @@ public class ParalympicsStatTracker extends StatTracker<Game>
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
public void onePerkLeap(PerkLeapEvent event)
public void onPerkLeap(PerkLeapEvent event)
{
if (getGame().GetState() != Game.GameState.Live)
return;