From ba41118da70a4b898bfe5ce0ebc201e56ec299d9 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 25 Aug 2015 01:58:57 +1200 Subject: [PATCH] Load boss battles properly --- .../core/boss/ironwizard/abilities/GolemBlockShot.java | 9 ++++++++- .../src/nautilus/game/arcade/ArcadeManager.java | 5 +++-- .../game/arcade/game/games/bossbattles/BossBattles.java | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockShot.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockShot.java index 447ceed4a..e2edcc29e 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockShot.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/ironwizard/abilities/GolemBlockShot.java @@ -409,7 +409,14 @@ public class GolemBlockShot extends GolemAbility Location l = falling.getLocation(); l.setY(entity.getLocation().getY()); - Vector vector = UtilAlg.getTrajectory(l, target.getEyeLocation()); + Location loc1 = target.getEyeLocation(); + + if (loc1.getY() - l.getY() > 1) + { + loc1.setY(l.getY() + 1); + } + + Vector vector = UtilAlg.getTrajectory(l, loc1); vector.multiply(13).add(new Vector(UtilMath.r(3) - 1, 0, UtilMath.r(3) - 1)).normalize(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 55e95d18d..5f0c7e6fa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -231,7 +231,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation _explosionManager.SetDebris(false); if (serverConfig.GameList.contains(GameType.ChampionsDominate) - || serverConfig.GameList.contains(GameType.ChampionsTDM)) + || serverConfig.GameList.contains(GameType.ChampionsTDM) + || serverConfig.GameList.contains(GameType.BossBattles)) { _conditionManager = new SkillConditionManager(plugin); } @@ -1292,7 +1293,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation public void toggleChampionsModules(GameType gameType) { - boolean isChamps = gameType == GameType.ChampionsDominate || gameType == GameType.ChampionsTDM; + boolean isChamps = gameType == GameType.ChampionsDominate || gameType == GameType.ChampionsTDM || gameType == GameType.BossBattles; if (_enabled == isChamps) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java index 26d78442d..884916234 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java @@ -286,7 +286,7 @@ public class BossBattles extends TeamGame private void setNewBoss(BattleBoss boss) { _currentBoss = createInstance(boss.getBoss(), new Location( - WorldData.World, 0, 2, 0)); + WorldData.World, 0, 6, 0)); _currentBoss.setInstantSchematic(true);