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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2015-04-14 01:32:11 -05:00
commit 3d6dce24ff
6 changed files with 14 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/achievement/AchievementManager.java
View File

@ -209,6 +209,8 @@ public class AchievementManager extends MiniPlugin
level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
else if (rank.Has(Rank.ADMIN))
level = Math.max(level, 30 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
else if (rank.Has(Rank.SNR_MODERATOR))
level = Math.max(level, 15);
else if (rank.Has(Rank.MODERATOR))
level = Math.max(level, 5);

10
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
View File

@ -50,7 +50,7 @@ public class CustomDamageEvent extends Event implements Cancellable
{
_eventCause = cause;
if (initialSource == null || initialReason == null)
//if (initialSource == null || initialReason == null)
_initialDamage = damage;
_damageeEntity = damagee;
@ -66,7 +66,7 @@ public class CustomDamageEvent extends Event implements Cancellable
_ignoreArmor = ignoreArmor;
if (initialSource != null && initialReason != null)
AddMod(initialSource, initialReason, damage, true);
AddMod(initialSource, initialReason, 0, true);
if (_eventCause == DamageCause.FALL)
_ignoreArmor = true;
@ -116,11 +116,11 @@ public class CustomDamageEvent extends Event implements Cancellable
{
double damage = GetDamageInitial();
for (DamageChange mult : _damageMult)
damage *= mult.GetDamage();
for (DamageChange mult : _damageMod)
damage += mult.GetDamage();
for (DamageChange mult : _damageMult)
damage *= mult.GetDamage();
return damage;
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -265,7 +265,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
new MiscManager(this);
_hologramManager = hologramManager;
_idleManager = new IdleManager(this);
new HolidayManager(this);
//new HolidayManager(this);
// Game Addons
new CompassAddon(plugin, this);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -1191,7 +1191,7 @@ public class Bridge extends TeamGame implements OreObsfucation
if (type != Material.GOLDEN_APPLE &&
type != Material.GOLDEN_CARROT &&
type != Material.FLINT_AND_STEEL)
type != Material.FLINT_AND_STEEL && type != Material.HOPPER)
return;
if (!(event.getInventory() instanceof CraftingInventory))

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
View File

@ -2134,6 +2134,8 @@ public class MineStrike extends TeamGame
targetTeam = GetTeamList().get(0);
SetPlayerTeam(event.getPlayer(), targetTeam, false);
((CraftPlayer) event.getPlayer()).getHandle().spectating = true;
}
@EventHandler(priority = EventPriority.HIGHEST)

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/ShopManager.java
View File

@ -287,7 +287,7 @@ public class ShopManager
public void update()
{
for (Player player : Host.GetPlayers(true))
for (Player player : Host.GetPlayers(false))
{
GameTeam team = Host.GetTeam(player);
@ -309,12 +309,12 @@ public class ShopManager
}
//Leave Shop
if (_inShop.contains(player) && (!nearShop || !isBuyTime()) || Host.Manager.isSpectator(player))
if (_inShop.contains(player) && (!nearShop || !isBuyTime()) || Host.Manager.isSpectator(player) || player.getAllowFlight())
{
leaveShop(player, true, false);
}
//Enter Shop
else if (!_inShop.contains(player) && (nearShop && isBuyTime()) && !Host.Manager.isSpectator(player))
else if (!_inShop.contains(player) && (nearShop && isBuyTime()) && !Host.Manager.isSpectator(player) && !player.getAllowFlight())
{
enterShop(player);
}