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

Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters

This commit is contained in:
Sam 2017-06-08 02:09:24 +01:00
parent 697d4a11ed 7cc7769378
commit 8c821af9de
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/economy/CashOutModule.java
View File

@ -176,7 +176,7 @@ public class CashOutModule extends MiniPlugin
}
else
{
Portal.getInstance().sendPlayerToGenericServer(player, GenericServer.BETA_HUB, Intent.FORCE_TRANSFER);
Portal.getInstance().sendPlayerToGenericServer(player, GenericServer.HUB, Intent.FORCE_TRANSFER);
runSyncLater(() ->
{

5
Plugins/mineplex-questmanager/src/mineplex/quest/common/QuestRarity.java
View File

@ -5,9 +5,8 @@ package mineplex.quest.common;
*/
public enum QuestRarity
{
// TODO fill in actual weights
COMMON(0.5),
RARE(0.3),
COMMON(1.0),
RARE(0.5),
LEGENDARY(0.1)
;