EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing debug code thats no longer required.

Browse Source
This commit is contained in:
Olof Larsson
2013-06-20 09:59:36 +02:00
parent a85e0eccdf
commit 2172ef79c8
2 changed files with 4 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/massivecraft/factions/PlayerRoleComparator.java
View File

@@ -29,35 +29,8 @@ public class PlayerRoleComparator implements Comparator<UPlayer>
if (ret != 0) return ret; if (ret != 0) return ret;
// Rank // Rank
// TODO: This error output is temporary. I need a way to detect what is going wrong. Rel r1 = o1.getRole();
Rel r1 = null; Rel r2 = o2.getRole();
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();
}
return r2.getValue() - r1.getValue(); return r2.getValue() - r1.getValue();
} }

15
src/com/massivecraft/factions/entity/UPlayer.java
View File

@@ -413,19 +413,8 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
public double getLimitedPower(double power) public double getLimitedPower(double power)
{ {
try power = Math.max(power, this.getPowerMin());
{ power = Math.min(power, this.getPowerMax());
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();
}
return power; return power;
} }