From bcd62f09a8b74dfb9068cbee72833ca91789954e Mon Sep 17 00:00:00 2001 From: asofold Date: Fri, 8 Feb 2013 11:13:46 +0100 Subject: [PATCH] Move some debug output to a method. --- .../checks/moving/MovingListener.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java index d5df45c7..6766bbe6 100644 --- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java +++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java @@ -489,19 +489,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo moveInfo.set(player, from, to, cc.yOnGround); if (cc.debug) { - final StringBuilder builder = new StringBuilder(250); - final Location loc = player.getLocation(); - builder.append(player.getName()); - builder.append(" " + from.getWorld().getName() + " " + StringUtil.fdec3.format(from.getX()) + (from.getX() == loc.getX() ? "" : ("(" + StringUtil.fdec3.format(loc.getX()) + ")"))); - builder.append(", " + StringUtil.fdec3.format(from.getY()) + (from.getY() == loc.getY() ? "" : ("(" + StringUtil.fdec3.format(loc.getY()) + ")"))); - builder.append(", " + StringUtil.fdec3.format(from.getZ()) + (from.getZ() == loc.getZ() ? "" : ("(" + StringUtil.fdec3.format(loc.getZ()) + ")"))); - builder.append(" -> " + StringUtil.fdec3.format(to.getX()) + ", " + StringUtil.fdec3.format(to.getY()) + ", " + StringUtil.fdec3.format(to.getZ())); - final double jump = mcAccess.getJumpAmplifier(player); - final double speed = mcAccess.getFasterMovementAmplifier(player); - if (speed != Double.NEGATIVE_INFINITY || jump != Double.NEGATIVE_INFINITY){ - builder.append(" (" + (speed != Double.NEGATIVE_INFINITY ? ("speed=" + speed) : "") + (jump != Double.NEGATIVE_INFINITY ? ("jump=" + jump) : "") + ")"); - } - System.out.print(builder.toString()); + outputMoveDebug(player, pFrom, pTo); } data.noFallAssumeGround = false; @@ -666,7 +654,23 @@ public class MovingListener extends CheckListener implements TickListener, IRemo // event.setTo(event.getFrom()); // TODO: revise this (old!) strategy, cancelled events just teleport to from, basically. // } - /** + private void outputMoveDebug(final Player player, final PlayerLocation from, final PlayerLocation to) { + final StringBuilder builder = new StringBuilder(250); + final Location loc = player.getLocation(); + builder.append(player.getName()); + builder.append(" " + from.getWorld().getName() + " " + StringUtil.fdec3.format(from.getX()) + (from.getX() == loc.getX() ? "" : ("(" + StringUtil.fdec3.format(loc.getX()) + ")"))); + builder.append(", " + StringUtil.fdec3.format(from.getY()) + (from.getY() == loc.getY() ? "" : ("(" + StringUtil.fdec3.format(loc.getY()) + ")"))); + builder.append(", " + StringUtil.fdec3.format(from.getZ()) + (from.getZ() == loc.getZ() ? "" : ("(" + StringUtil.fdec3.format(loc.getZ()) + ")"))); + builder.append(" -> " + StringUtil.fdec3.format(to.getX()) + ", " + StringUtil.fdec3.format(to.getY()) + ", " + StringUtil.fdec3.format(to.getZ())); + final double jump = mcAccess.getJumpAmplifier(player); + final double speed = mcAccess.getFasterMovementAmplifier(player); + if (speed != Double.NEGATIVE_INFINITY || jump != Double.NEGATIVE_INFINITY){ + builder.append(" (" + (speed != Double.NEGATIVE_INFINITY ? ("speed=" + speed) : "") + (jump != Double.NEGATIVE_INFINITY ? ("jump=" + jump) : "") + ")"); + } + System.out.print(builder.toString()); + } + + /** * Monitor level PlayerMoveEvent. * @param event */