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

Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report

This commit is contained in:
Keir 2015-10-27 22:40:23 +00:00
parent 4ceb8f20aa 556d5adcd9
commit dd321439a6
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/globalpacket/command/GlobalPacketCommand.java
View File

@ -12,7 +12,7 @@ public class GlobalPacketCommand extends CommandBase<GlobalPacketManager>
{
public GlobalPacketCommand(GlobalPacketManager plugin)
{
super(plugin, Rank.ADMIN, "global");
super(plugin, Rank.ADMIN, "globalpacket");
}
@Override
@ -20,8 +20,8 @@ public class GlobalPacketCommand extends CommandBase<GlobalPacketManager>
{
if (args == null || args.length < 1)
{
UtilPlayer.message(caller, F.main("Global", "Please call the global command with at least 1 argument"));
UtilPlayer.message(caller, F.main("Global", "For help please see /global google doc"));
UtilPlayer.message(caller, F.main("Global", "Please call the globalpacket command with at least 1 argument"));
UtilPlayer.message(caller, F.main("Global", "For help please see /globalpacket google doc"));
return;
}

2
Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
View File

@ -7,7 +7,7 @@ public enum RewardType
OldChest( 0, 0.05, 0.4, 5),
AncientChest( 0, 1, 4, 25),
MythicalChest( 0.4, 3, 12, 75),
MythicalChest( 0.3, 3, 12, 75),
SpinnerFiller( 0.1, 1, 4, 20),
SpinnerReal( 0.000001, 0.05, 0.4, 5);

2
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/RankReward.java
View File

@ -39,7 +39,7 @@ public class RankReward extends Reward
else if (_clientManager.Get(player).GetRank() == Rank.HERO) rank = Rank.LEGEND;
else if (rewardType == RewardType.MythicalChest && _clientManager.Get(player).GetRank() == Rank.LEGEND) rank = Rank.TITAN;
if (rewardType == RewardType.MythicalChest && _random.nextDouble() < 0.02) // 2 Percent
if (rewardType == RewardType.MythicalChest && _random.nextDouble() < 0.01) // 1 Percent
rank = Rank.TITAN;
if (rank == null)

2
Plugins/Mineplex.Core/src/mineplex/core/titangiveaway/redis/GiveawayMessageHandler.java
View File

@ -40,7 +40,7 @@ public class GiveawayMessageHandler implements CommandCallback
for (Player player : UtilServer.getPlayers())
{
player.sendMessage(chatMessage);
// player.sendMessage(chatMessage);
player.playSound(player.getEyeLocation(), Sound.AMBIENCE_CAVE, 1, 1);
}
}

4
Plugins/Mineplex.Core/src/mineplex/core/titangiveaway/redis/TitanChestGiveawayHandler.java
View File

@ -12,7 +12,7 @@ import mineplex.serverdata.commands.ServerCommand;
public class TitanChestGiveawayHandler implements CommandCallback
{
private static final long COOLDOWN = 60000L * 90; // 90 Minutes
private static final long COOLDOWN = 60000L * 120; // 120 Minutes
private ServerStatusManager _statusManager;
private long _lastTimer;
@ -37,7 +37,7 @@ public class TitanChestGiveawayHandler implements CommandCallback
for (Player player : UtilServer.getPlayers())
{
player.sendMessage(chatMessage);
// player.sendMessage(chatMessage);
player.playSound(player.getEyeLocation(), Sound.AMBIENCE_CAVE, 1, 1);
}

2
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
View File

@ -47,7 +47,7 @@ public class TreasureManager extends MiniPlugin
100, 250,
500, 1000,
4000, 6000,
12000, 32000,
12000, 22000,
true, false);
World world = Bukkit.getWorlds().get(0);