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

This commit is contained in:
Jonathan Williams 2014-12-01 16:14:15 -08:00
parent 384f296d60 6319bffd42
commit 7a3b4771ee
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Core/src/me/chiss/Core/Modules/Fix.java
View File

@ -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."));

4
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java
View File

@ -191,8 +191,8 @@ public class Blink extends SkillActive
done = true;
}
Factory.Teleport().TP(player, target);
player.teleport(target);
player.setFallDistance(0);
//Effect

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java
View File

@ -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())

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java
View File

@ -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);

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java
View File

@ -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)) + "."));

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FissureData.java
View File

@ -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

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/RootingAxe.java
View File

@ -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());

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
View File

@ -1400,7 +1400,7 @@ public class UHC extends TeamGame
{
return ChatColor.YELLOW + "In Progress";
}
//Ended
if (GetState() == GameState.End || GetState() == GameState.Dead)
{