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:
Jonathan Williams 2014-08-26 04:56:34 -07:00
commit 232785a7dd
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
View File

@ -11,7 +11,7 @@ public enum Achievement
//Bridges
BRIDGES_WINS("Bridge Champion", 600,
new String[] {"The Bridges.Wins"},
new String[] {"Win 50 games of Survival Games"},
new String[] {"Win 50 games of The Bridges"},
new int[] {50},
AchievementCategory.BRIDGES),
@ -154,7 +154,7 @@ public enum Achievement
//Draw My Thing
DRAW_MY_THING_WINS("Art Hipster", 600,
new String[] {"Draw My Thing.Wins"},
new String[] {"Win 50 games of Block Hunt"},
new String[] {"Win 50 games of Draw My Thing"},
new int[] {50},
AchievementCategory.DRAW_MY_THING),
@ -334,7 +334,7 @@ public enum Achievement
//Dragons
DRAGONS_WINS("Dragon Tamer", 600,
new String[] {"Dragons.Wins"},
new String[] {"Win 50 games of Snake"},
new String[] {"Win 50 games of Dragons"},
new int[] {50},
AchievementCategory.DRAGONS),

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
View File

@ -72,10 +72,6 @@ public class Arcade extends JavaPlugin
String webServerAddress = getConfig().getString(WEB_CONFIG);
int andthecatisdog = 0;
andthecatisdog += andthecatisdog;
andthecatisdog = 5;
Logger.initialize(this);
//Static Modules

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameAchievementManager.java
View File

@ -92,6 +92,8 @@ public class GameAchievementManager implements Listener
String progress = F.elem(C.cGreen + "+" + log.get(type).Amount);
boolean displayDesc = true;
//Completed Achievement
if (data.getLevel() == type.getMaxLevel())
{
@ -114,6 +116,7 @@ public class GameAchievementManager implements Listener
else
{
//Display nothing because already complete bro :O
displayDesc = false;
}
}
//Multi-Level Achievements
@ -149,11 +152,12 @@ public class GameAchievementManager implements Listener
}
}
for (String desc : type.getDesc())
{
UtilPlayer.message(player, desc);
out++;
}
if (displayDesc)
for (String desc : type.getDesc())
{
UtilPlayer.message(player, desc);
out++;
}
out++;