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-09 07:26:05 -05:00
commit 800658ff48
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ package mineplex.core.achievement;
public enum Achievement
{
GLOBAL_GEM_HUNTER("Gem Hunter", new String[] {"Global.GemsEarned"}, new int[] {10000, 20000, 30000, 40000, 50000, 60000, 70000, 80000, 90000, 100000, 110000, 120000}),
GLOBAL_GEM_HUNTER("Gem Hunter", new String[] {"Global.GemsEarned"}, new int[] {10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000, 55000, 60000, 65000}),
GAME_SPLEEF_SMASHER("Spleef Smasher", new String[] {"Super Spleef.BlocksBroken"}, new int[] {100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200});

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemTNT.java
View File

@ -51,7 +51,7 @@ public class ItemTNT extends ItemGadget
HashMap<Player, Double> players = UtilPlayer.getInRadius(event.getLocation(), 10);
for (Player player : players.keySet())
{
if (!Manager.collideEvent(this, player))
if (Manager.collideEvent(this, player))
continue;
double mult = players.get(player);

2
Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java
View File

@ -38,7 +38,7 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack
public SalesPackageBase(String name, Material material, byte displayData, String[] description, int coins)
{
this(name, material, (byte)0, description, 0, 1);
this(name, material, (byte)0, description, coins, 1);
}
public SalesPackageBase(String name, Material material, byte displayData, String[] description, int coins, int quantity)

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubClient.java
View File

@ -30,7 +30,7 @@ public class HubClient
ScoreboardString = " Welcome " + name + ", to the Mineplex Network!";
}
public void SetLastGemCount(int gems)
public void SetLastGemCount(int gems)
{
_lastGemCount = gems;
}