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

Fixed a few bugs.

Browse Source
This commit is contained in:
Mysticate 2015-08-27 20:47:55 -06:00
parent f2f6afb6ca
commit 571d992dbe
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/EvoKit.java
View File

@ -6,7 +6,6 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilSkull;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeFormat;
@ -131,7 +130,7 @@ public abstract class EvoKit extends Kit
UtilPlayer.message(player, ArcadeFormat.Line);
UtilTextMiddle.display(null, def, player);
// UtilTextMiddle.display(null, def, player);
}
@EventHandler(priority = EventPriority.HIGH)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
View File

@ -440,7 +440,7 @@ public class Evolution extends SoloGame
token.LifeKills++;
UtilPlayer.message(player, "");
UtilPlayer.message(player, F.main("Game", F.elem(token.LifeKills + " Kill" + (token.LifeKills == 1 ? "" : "s")) + " - " + F.elem(Math.max(1.0, 6.0 - (1.5 * (token.LifeKills - 1))) + " Second ") + "evolve speed" + (token.SupplementKit instanceof KitEvolveSpeed ? C.cGreen + " - 30% (Quick Evolver)" : "")));
UtilPlayer.message(player, F.main("Game", F.elem(token.LifeKills + " Kill" + (token.LifeKills == 1 ? "" : "s")) + C.cWhite + " - " + C.cGreen + Math.max(1.0, 6.0 - (1.5 * (token.LifeKills - 1))) + "s evolve speed" + (token.SupplementKit instanceof KitEvolveSpeed ? C.cGreen + " - 30% (Quick Evolver)" : "")));
UtilPlayer.message(player, "");
}

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/evolve/EvolveData.java
View File

@ -132,13 +132,10 @@ public class EvolveData
private void setupViewingToken(EntityInsentient ent)
{
Location center = _token.Platform.clone().add(0.5, (ent.boundingBox.e - ent.boundingBox.b) / 2 - 1, 0.5);
Location offset = UtilAlg.getNearestCornerLocation(_token.Viewing, center.getBlock());
Location playerEye = _token.Viewing.clone().add(.5, .62, .5);
Location entityHalf = _token.Platform.clone().add(.5, -1, .5).add(0, (ent.boundingBox.e - ent.boundingBox.b) / 2, 0);
center.setX(offset.getX());
center.setZ(offset.getZ());
Vector viewing = UtilAlg.getTrajectory(_token.Viewing, offset);
Vector viewing = UtilAlg.getTrajectory(playerEye, entityHalf);
_token.Viewing.setPitch(UtilAlg.GetPitch(viewing));
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFallModifier.java
View File

@ -22,7 +22,7 @@ public class PerkFallModifier extends Perk
@EventHandler(priority = EventPriority.HIGH)
public void Knockback(CustomDamageEvent event)
{
if (event.GetCause() == DamageCause.FALL)
if (event.GetCause() != DamageCause.FALL)
return;
if (!(event.GetDamageeEntity() instanceof Player))
@ -39,6 +39,6 @@ public class PerkFallModifier extends Perk
if (!Manager.IsAlive(player))
return;
event.AddMod("Fall Modifier", "Reduce damage", (-event.GetDamage()) + event.GetDamageInitial() * _fall, false);
event.AddMod("Fall Modifier", "Reduce damage", _fall, false);
}
}