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 feature/moba

Browse Source
This commit is contained in:
Sam 2017-06-16 18:44:50 +01:00
commit 378fddf0c5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/beta/BetaWhitelist.java
View File

@ -55,8 +55,8 @@ public class BetaWhitelist extends MiniPlugin
{
Player player = event.getPlayer();
Rank rank = _clientManager.Get(player).GetRank(true);
if ((rank != Rank.MAPDEV && rank != Rank.MAPPER && rank != Rank.MAPLEAD && rank.has(Rank.TITAN) // If this player is Titan+ (and not a builder),
|| _powerPlayClubRepository.getCachedData(player).isSubscribed()) // a PPC subscriber,
if (rank.has(Rank.TITAN) // If this player is Titan+
|| _powerPlayClubRepository.getCachedData(player).isSubscribed() // a PPC subscriber,
|| EXTRA_PLAYERS.contains(player.getUniqueId())) // or explicitly whitelisted,
{
return; // allow them in

5
Plugins/Mineplex.Hub/src/mineplex/hub/brawl/fountain/FountainManager.java
View File

@ -52,7 +52,10 @@ public class FountainManager extends MiniPlugin
@EventHandler
public void onDamage(EntityDamageByEntityEvent event)
{
tryBrawl((Player)event.getDamager(), event.getEntity());
if (event.getDamager() instanceof Player)
{
tryBrawl((Player) event.getDamager(), event.getEntity());
}
}
private void tryBrawl(Player player, Entity entity)