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

Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover

Browse Source
This commit is contained in:
Sam 2017-09-01 16:44:58 +01:00
commit 69f7078534
3 changed files with 8 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/gadget/GadgetManager.java
View File

@ -324,8 +324,10 @@ public class GadgetManager extends MiniPlugin
TITAN_PARTICLE_EFFECT,
HERO_MORPH_BLAZE,
HERO_MORPH_CREEPER,
HERO_MOUNT,
ULTRA_MORPH,
TITAN_MORPH,
TITAN_MOUNT,
LEGEND_MORPH,
AMMO_COMMAND,
LOCK_INFUSED_COMMAND,
@ -409,6 +411,8 @@ public class GadgetManager extends MiniPlugin
PermissionGroup.TITAN.setPermission(Perm.TITAN_PARTICLE_EFFECT, true, true);
PermissionGroup.HERO.setPermission(Perm.HERO_MORPH_BLAZE, true, true);
PermissionGroup.HERO.setPermission(Perm.HERO_MORPH_CREEPER, true, true);
PermissionGroup.HERO.setPermission(Perm.HERO_MOUNT, true, true);
PermissionGroup.TITAN.setPermission(Perm.TITAN_MOUNT, true, true);
PermissionGroup.ULTRA.setPermission(Perm.ULTRA_MORPH, true, true);
PermissionGroup.TITAN.setPermission(Perm.TITAN_MORPH, true, true);
PermissionGroup.LEGEND.setPermission(Perm.LEGEND_MORPH, true, true);

3
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountDragon.java
View File

@ -15,6 +15,7 @@ import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.common.util.UtilText;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.GadgetManager.Perm;
import mineplex.core.gadget.gadgets.mount.DragonData;
import mineplex.core.gadget.gadgets.mount.DragonMount;
import mineplex.core.gadget.util.CostConstants;
@ -110,7 +111,7 @@ public class MountDragon extends DragonMount
@EventHandler
public void HeroOwner(PlayerJoinEvent event)
{
if (Manager.getClientManager().Get(event.getPlayer()).hasPermission(MountManager.Perm.HERO_MOUNT))
if (Manager.getClientManager().Get(event.getPlayer()).hasPermission(Perm.HERO_MOUNT))
{
Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName());
}

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountTitan.java
View File

@ -5,13 +5,13 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilText;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.GadgetManager.Perm;
import mineplex.core.gadget.gadgets.mount.Mount;
import mineplex.core.gadget.util.CostConstants;
import mineplex.core.updater.UpdateType;
@ -77,7 +77,7 @@ public class MountTitan extends Mount<MountTitanData>
@EventHandler
public void titanOwner(PlayerJoinEvent event)
{
if (Manager.getClientManager().hasRank(event.getPlayer(), Rank.TITAN))
if (Manager.getClientManager().Get(event.getPlayer()).hasPermission(Perm.TITAN_MOUNT))
{
Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName());
}