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 2015-08-03 09:37:12 -05:00
commit a623cc16ce
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ public enum RewardType
GameLoot( 0.000001, 0.00001, 0.0001, 3), GameLoot( 0.000001, 0.00001, 0.0001, 3),
OldChest( 0, 0.05, 0.4, 5), OldChest( 0, 0.05, 0.4, 5),
AncientChest( 0, 1, 4, 25), AncientChest( 0, 1, 4, 25),
MythicalChest( 0.5, 3, 12, 75); MythicalChest( 0.4, 3, 12, 75);
private double _mythicalChance; private double _mythicalChance;
private double _legendaryChance; private double _legendaryChance;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java
View File

@ -80,7 +80,7 @@ public class Quiver extends SoloGame
this.BlockBreakAllow.add(102); this.BlockBreakAllow.add(102);
this.BlockBreakAllow.add(20); this.BlockBreakAllow.add(20);
this.DeathSpectateSecs = 2; this.DeathSpectateSecs = 1;
_scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Kills", "dummy"); _scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Kills", "dummy");
_scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME); _scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME);

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -727,8 +727,11 @@ public class GameFlagManager implements Listener
return; return;
} }
if (time > 3)
{
UtilPlayer.message(player, C.cWhite + C.Bold + "You will respawn in " + time + " seconds..."); UtilPlayer.message(player, C.cWhite + C.Bold + "You will respawn in " + time + " seconds...");
UtilTextMiddle.display(null, "Respawning in " + time + " seconds...", 5, 40, 5, player); UtilTextMiddle.display(null, "Respawning in " + time + " seconds...", 5, 40, 5, player);
}
Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
{ {

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

@ -117,9 +117,6 @@ public class GameGemManager implements Listener
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void GameStateChange(GameStateChangeEvent event) public void GameStateChange(GameStateChangeEvent event)
{ {
if (!Manager.IsRewardGems())
return;
if (event.GetState() != GameState.Dead) if (event.GetState() != GameState.Dead)
return; return;
@ -129,12 +126,12 @@ public class GameGemManager implements Listener
public void RewardGems(Game game, Player player, boolean give) public void RewardGems(Game game, Player player, boolean give)
{ {
if (!Manager.IsRewardGems())
return;
//Inform Gems //Inform Gems
AnnounceGems(game, player, game.GetPlayerGems().get(player), give); AnnounceGems(game, player, game.GetPlayerGems().get(player), give);
if (!Manager.IsRewardGems())
return;
//Give Gems //Give Gems
if (give) if (give)
GiveGems(game, player, game.GetPlayerGems().remove(player), game.GemMultiplier); GiveGems(game, player, game.GetPlayerGems().remove(player), game.GemMultiplier);
@ -221,7 +218,12 @@ public class GameGemManager implements Listener
} }
if (!Manager.IsRewardGems()) if (!Manager.IsRewardGems())
{
UtilPlayer.message(player, "");
UtilPlayer.message(player, ArcadeFormat.Line);
return; return;
}
earnedGems = (int) (earnedGems * game.GemMultiplier); earnedGems = (int) (earnedGems * game.GemMultiplier);