From 2172ef79c819825ca211c67acb60a7b512c3cbcc Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Thu, 20 Jun 2013 09:59:36 +0200 Subject: [PATCH] Removing debug code thats no longer required. --- .../factions/PlayerRoleComparator.java | 31 ++----------------- .../massivecraft/factions/entity/UPlayer.java | 15 ++------- 2 files changed, 4 insertions(+), 42 deletions(-) diff --git a/src/com/massivecraft/factions/PlayerRoleComparator.java b/src/com/massivecraft/factions/PlayerRoleComparator.java index f6122e8c..5a585708 100644 --- a/src/com/massivecraft/factions/PlayerRoleComparator.java +++ b/src/com/massivecraft/factions/PlayerRoleComparator.java @@ -29,35 +29,8 @@ public class PlayerRoleComparator implements Comparator if (ret != 0) return ret; // Rank - // TODO: This error output is temporary. I need a way to detect what is going wrong. - Rel r1 = null; - Rel r2 = null; - try - { - r1 = o1.getRole(); - } - catch (Exception e) - { - System.out.println("Could not get role for o1: " + o1.getId()); - System.out.println("universe o1: " + o1.getUniverse()); - System.out.println("attached o1: " + o1.attached()); - System.out.println("Now dumping the data o1: " + Factions.get().gson.toJson(o1)); - e.printStackTrace(); - } - - try - { - r2 = o2.getRole(); - } - catch (Exception e) - { - System.out.println("Could not get role for o2: " + o2.getId()); - System.out.println("universe o2: " + o2.getUniverse()); - System.out.println("attached o2: " + o2.attached()); - System.out.println("Now dumping the data o2: " + Factions.get().gson.toJson(o2)); - e.printStackTrace(); - } - + Rel r1 = o1.getRole(); + Rel r2 = o2.getRole(); return r2.getValue() - r1.getValue(); } diff --git a/src/com/massivecraft/factions/entity/UPlayer.java b/src/com/massivecraft/factions/entity/UPlayer.java index e785f80e..46b0a1af 100644 --- a/src/com/massivecraft/factions/entity/UPlayer.java +++ b/src/com/massivecraft/factions/entity/UPlayer.java @@ -413,19 +413,8 @@ public class UPlayer extends SenderEntity implements EconomyParticipato public double getLimitedPower(double power) { - try - { - power = Math.max(power, this.getPowerMin()); - power = Math.min(power, this.getPowerMax()); - } - catch (Exception e) - { - System.out.println("Could not limit power for this: " + this.getId()); - System.out.println("universe this: " + this.getUniverse()); - System.out.println("attached this: " + this.attached()); - System.out.println("Now dumping the data this: " + Factions.get().gson.toJson(this)); - e.printStackTrace(); - } + power = Math.max(power, this.getPowerMin()); + power = Math.min(power, this.getPowerMax()); return power; }