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

Send players to beta hubs; add 2fa and anticheat

This commit is contained in:
cnr 2017-02-24 03:33:26 -06:00
parent 162ab602b2
commit 68f61bbb20
8 changed files with 23 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/portal/Commands/SendCommand.java
View File

@ -1,4 +1,4 @@
package mineplex.core.portal.commands;
package mineplex.core.portal.Commands;
import org.bukkit.entity.Player;

2
Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
View File

@ -1,4 +1,4 @@
package mineplex.core.portal.commands;
package mineplex.core.portal.Commands;
import org.bukkit.entity.Player;

7
Plugins/Mineplex.Core/src/mineplex/core/portal/GenericServer.java
View File

@ -12,7 +12,12 @@ public enum GenericServer
/**
* The Clans Hubs, such as ClansHub-1
*/
CLANS_HUB("ClansHub");
CLANS_HUB("ClansHub"),
/**
* The Beta Hubs, such as BetaHub-1
*/
BETA_HUB("BetaHub"),
;
private final String _name;

4
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
View File

@ -24,8 +24,8 @@ import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTabTitle;
import mineplex.core.portal.commands.SendCommand;
import mineplex.core.portal.commands.ServerCommand;
import mineplex.core.portal.Commands.SendCommand;
import mineplex.core.portal.Commands.ServerCommand;
import mineplex.core.portal.events.GenericServerTransferEvent;
import mineplex.core.portal.events.ServerTransferEvent;
import mineplex.serverdata.Region;

2
Plugins/mineplex-game-gemhunters/plugin.yml
View File

@ -1,4 +1,4 @@
name: Gem-Hunters
name: GemHunters
main: mineplex.gemhunters.GemHunters
version: 0.1
commands:

7
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java
View File

@ -12,6 +12,7 @@ import mineplex.core.FoodDupeFix;
import mineplex.core.TimingsFix;
import mineplex.core.account.CoreClientManager;
import mineplex.core.achievement.AchievementManager;
import mineplex.core.antihack.AntiHack;
import mineplex.core.beta.BetaWhitelist;
import mineplex.core.blockrestore.BlockRestore;
import mineplex.core.boosters.BoosterManager;
@ -55,6 +56,7 @@ import mineplex.core.stats.StatsManager;
import mineplex.core.status.ServerStatusManager;
import mineplex.core.teleport.Teleport;
import mineplex.core.thank.ThankManager;
import mineplex.core.twofactor.TwoFactorAuth;
import mineplex.core.updater.FileUpdater;
import mineplex.core.updater.Updater;
import mineplex.core.visibility.VisibilityManager;
@ -173,7 +175,7 @@ public class GemHunters extends JavaPlugin
new DamageManager(this, new CombatManager(this), new NpcManager(this, creature), disguiseManager, new ConditionManager(this));
// GWEN
// require(AntiHack.class);
require(AntiHack.class);
// Block Restore
BlockRestore blockRestore = require(BlockRestore.class);
@ -287,6 +289,9 @@ public class GemHunters extends JavaPlugin
MinecraftServer.getServer().getPropertyManager().setProperty("debug", false);
SpigotConfig.debug = false;
// Two-factor auth
require(TwoFactorAuth.class);
// beta whitelist
new BetaWhitelist(clientManager, new PowerPlayClubRepository(this, clientManager, donationManager));
}

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

@ -30,6 +30,9 @@ import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.donation.DonationManager;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.portal.GenericServer;
import mineplex.core.portal.Intent;
import mineplex.core.portal.Portal;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
@ -166,8 +169,7 @@ public class CashOutModule extends MiniPlugin
session.endSession();
iterator.remove();
player.kickPlayer(C.cGreen + "Imagine you are being sent to the Lobby.");
// Portal.getInstance().sendToHub(player, null);
Portal.getInstance().sendPlayerToGenericServer(player, GenericServer.BETA_HUB, Intent.PLAYER_REQUEST);
}
}
}

3
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/spawn/SpawnModule.java
View File

@ -21,6 +21,7 @@ import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilServer;
import mineplex.core.portal.GenericServer;
import mineplex.core.portal.Intent;
import mineplex.core.portal.Portal;
import mineplex.gemhunters.death.npc.CombatLogNPC;
@ -146,7 +147,7 @@ public class SpawnModule extends MiniPlugin
new SimpleNPC(_plugin, location, Villager.class, C.cGoldB + "Return To Hub", clicker -> {
Portal.getInstance().sendToHub(clicker, null, Intent.PLAYER_REQUEST);
Portal.getInstance().sendPlayerToGenericServer(clicker, GenericServer.BETA_HUB, Intent.PLAYER_REQUEST);
});
}