From 44102842c9df2e4df24aec7430687f730da2cbd2 Mon Sep 17 00:00:00 2001 From: Cheese Date: Fri, 17 Jul 2015 13:27:55 +1000 Subject: [PATCH] added some velocity debug --- .../src/mineplex/core/common/util/UtilAction.java | 10 +++++++++- .../minecraft/game/core/damage/DamageManager.java | 9 +++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java index 1b870ada9..ab1814725 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAction.java @@ -1,7 +1,9 @@ package mineplex.core.common.util; +import org.bukkit.Material; import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; import org.bukkit.util.Vector; public class UtilAction @@ -37,6 +39,12 @@ public class UtilAction //Velocity ent.setFallDistance(0); - ent.setVelocity(vec); + ent.setVelocity(vec); + + //Debug + if (ent instanceof Player && UtilGear.isMat(((Player)ent).getItemInHand(), Material.SUGAR)) + { + UtilPlayer.message(ent, F.main("Debug", "Velocity Sent: " + vec.length())); + } } } diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java index aab72ed1e..8e052c32d 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java @@ -391,10 +391,11 @@ public class DamageManager extends MiniPlugin trajectory.setY(Math.abs(trajectory.getY())); //Apply - UtilAction.velocity(event.GetDamageeEntity(), - trajectory, 0.2 + trajectory.length() * 0.8, false, 0, Math.abs(0.2 * knockback), 0.4 + (0.04 * knockback), true); + double vel = 0.2 + trajectory.length() * 0.8; + + UtilAction.velocity(event.GetDamageeEntity(), trajectory, vel, + false, 0, Math.abs(0.2 * knockback), 0.4 + (0.04 * knockback), true); } - } catch (IllegalAccessException e) { @@ -414,7 +415,7 @@ public class DamageManager extends MiniPlugin { for (Player player : UtilServer.getPlayers()) { - if (!UtilGear.isMat(player.getItemInHand(), Material.BOOK)) + if (!UtilGear.isMat(player.getItemInHand(), Material.COMMAND)) continue; UtilPlayer.message(player, " ");