From 185b182061a370594f1c055a5c65be5fc92961a6 Mon Sep 17 00:00:00 2001 From: Chiss Date: Tue, 2 Dec 2014 09:50:30 +1100 Subject: [PATCH] fixed teleports removing you from the game --- Plugins/Core/src/me/chiss/Core/Modules/Fix.java | 2 +- .../minecraft/game/classcombat/Skill/Assassin/Blink.java | 4 ++-- .../minecraft/game/classcombat/Skill/Assassin/Evade.java | 2 +- .../minecraft/game/classcombat/Skill/Assassin/Flash.java | 2 +- .../minecraft/game/classcombat/Skill/Assassin/Recall.java | 2 +- .../minecraft/game/classcombat/Skill/Mage/FissureData.java | 2 +- .../minecraft/game/classcombat/Skill/Mage/RootingAxe.java | 2 +- .../src/nautilus/game/arcade/game/games/uhc/UHC.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Plugins/Core/src/me/chiss/Core/Modules/Fix.java b/Plugins/Core/src/me/chiss/Core/Modules/Fix.java index 2b9f2f618..fe572c602 100644 --- a/Plugins/Core/src/me/chiss/Core/Modules/Fix.java +++ b/Plugins/Core/src/me/chiss/Core/Modules/Fix.java @@ -137,7 +137,7 @@ public class Fix extends AModule return; //Teleport - Teleport().TP(event.getPlayer(), UtilWorld.locMerge(event.getPlayer().getLocation(), block.getLocation().add(0.5, 0, 0.5))); + event.getPlayer().teleport(UtilWorld.locMerge(event.getPlayer().getLocation(), block.getLocation().add(0.5, 0, 0.5))); //Inform UtilPlayer.message(event.getPlayer(), F.main(_moduleName, "Block Climb Prevented.")); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java index 162969ae2..7a1d5f331 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java @@ -191,8 +191,8 @@ public class Blink extends SkillActive done = true; } - Factory.Teleport().TP(player, target); - + player.teleport(target); + player.setFallDistance(0); //Effect diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java index 3ca970e44..5b4d9d855 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java @@ -158,7 +158,7 @@ public class Evade extends SkillActive (float)(Math.random() - 0.5), (float)(Math.random() * 1.4), (float)(Math.random() - 0.5), 0, 10); //Action - Factory.Teleport().TP(damagee, target); + damagee.teleport(target); //Cloak if (damagee.isSneaking()) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java index 00fec1077..9e3890b3c 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java @@ -144,7 +144,7 @@ public class Flash extends SkillActive Location loc = player.getLocation().add(player.getLocation().getDirection().multiply(curRange).add(new Vector(0, 0.4, 0))); if (curRange > 0) - Factory.Teleport().TP(player, loc); + player.teleport(loc); player.setFallDistance(0); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java index 6c0f68522..6c860f086 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java @@ -83,7 +83,7 @@ public class Recall extends Skill Location current = player.getLocation(); Location target = locs.getLast(); - Factory.Teleport().TP(player, target); + player.teleport(target); //Inform UtilPlayer.message(player, F.main(GetClassType().name(), "You used " + F.skill(GetName(level)) + ".")); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java index 69dae6e1a..cdfb985fe 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java @@ -144,7 +144,7 @@ public class FissureData //Teleport if (cur.getLocation().getBlock().equals(block)) { - Host.Factory.Teleport().TP(cur, cur.getLocation().add(0, 1, 0)); + cur.teleport(cur.getLocation().add(0, 1, 0)); } //Damage diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/RootingAxe.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/RootingAxe.java index cf9283f8b..9582e3e7f 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/RootingAxe.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/RootingAxe.java @@ -74,7 +74,7 @@ public class RootingAxe extends Skill return; //Action - Factory.Teleport().TP(damagee, damagee.getLocation().add(0, -0.9, 0)); + damagee.teleport(damagee.getLocation().add(0, -0.9, 0)); //Effect damagee.getWorld().playEffect(damagee.getLocation().add(0, 1, 0), Effect.STEP_SOUND, damagee.getLocation().getBlock().getTypeId()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java index ab74aa916..e586867e8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java @@ -1400,7 +1400,7 @@ public class UHC extends TeamGame { return ChatColor.YELLOW + "In Progress"; } - + //Ended if (GetState() == GameState.End || GetState() == GameState.Dead) {