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

stacker pref is now only for pvp stacking.

Browse Source
This commit is contained in:
Cheese 2015-09-05 10:30:11 +10:00
parent fc5ccd4a5e
commit 0ac808ba43
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
View File

@ -243,7 +243,7 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
UserPreferences userPreferences = getPlugin().Get(getPlayer());
int index = 9;
buildPreference(index, Material.FIREBALL, "Hub Stacker", userPreferences.HubGames, _toggleHubGames);
buildPreference(index, Material.FIREBALL, "Hub Player Stacker", userPreferences.HubGames, _toggleHubGames);
index += 2;
buildPreference(index, Material.EYE_OF_ENDER, "Hub Player Visibility", userPreferences.ShowPlayers, _toggleHubPlayers);
index += 2;

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -866,7 +866,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
return UtilTime.elapsed(_portalTime.get(player.getName()), 5000);
}
public boolean CanBump(LivingEntity ent)
public boolean hasPlayerStackingEnabled(LivingEntity ent)
{
if (!(ent instanceof Player))
return true;

18
Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
View File

@ -95,12 +95,6 @@ public class StackerManager extends MiniPlugin implements IThrown
return;
}
if (!Manager.CanBump(stacker))
{
UtilPlayer.message(stacker, F.main("Stacker", "You are not playing stacker."));
return;
}
if (stacker.getVehicle() != null || _tempStackShift.contains(stacker))
{
UtilPlayer.message(stacker, F.main("Stacker", "You cannot stack while stacked..."));
@ -123,9 +117,15 @@ public class StackerManager extends MiniPlugin implements IThrown
if (stackee instanceof Player)
{
if (!Manager.CanBump(((Player)stackee)))
if (!Manager.hasPlayerStackingEnabled(stacker))
{
UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is not playing stacker."));
UtilPlayer.message(stacker, F.main("Stacker", "You have player stacking disabled."));
return;
}
if (!Manager.hasPlayerStackingEnabled(((Player)stackee)))
{
UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " has player stacking disabled."));
return;
}
@ -242,7 +242,7 @@ public class StackerManager extends MiniPlugin implements IThrown
if (target.getCustomName() != null || (target.getPassenger() != null && target.getPassenger() instanceof LivingEntity && ((LivingEntity)target.getPassenger()).getCustomName() != null))
return;
if (!Manager.CanBump(target))
if (!Manager.hasPlayerStackingEnabled(target))
return;
//Velocity