Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.2h - Resolve PSS NullPointerException through MassiveExceptions.

Browse Source
This commit is contained in:
ulumulu1510 2016-02-26 16:57:09 +01:00 committed by Olof Larsson
parent 1037a11149
commit 9a3b472e96
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java
View File

@ -48,8 +48,6 @@ public class CmdFactionsSetCircle extends CmdFactionsSetXRadius
chunks.add(chunk); // The center should come first for pretty messages chunks.add(chunk); // The center should come first for pretty messages
Integer radiusZero = this.getRadiusZero(); Integer radiusZero = this.getRadiusZero();
if (radiusZero == null) return null;
double radiusSquared = radiusZero * radiusZero; double radiusSquared = radiusZero * radiusZero;
for (int dx = -radiusZero; dx <= radiusZero; dx++) for (int dx = -radiusZero; dx <= radiusZero; dx++)

3
src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java
View File

@ -48,8 +48,7 @@ public class CmdFactionsSetSquare extends CmdFactionsSetXRadius
chunks.add(chunk); // The center should come first for pretty messages chunks.add(chunk); // The center should come first for pretty messages
Integer radiusZero = this.getRadiusZero(); Integer radiusZero = this.getRadiusZero();
if (radiusZero == null) return null;
for (int dx = -radiusZero; dx <= radiusZero; dx++) for (int dx = -radiusZero; dx <= radiusZero; dx++)
{ {
for (int dz = -radiusZero; dz <= radiusZero; dz++) for (int dz = -radiusZero; dz <= radiusZero; dz++)

7
src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java
View File

@ -37,15 +37,13 @@ public abstract class CmdFactionsSetXRadius extends CmdFactionsSetX
// Radius Claim Min // Radius Claim Min
if (radius < 1) if (radius < 1)
{ {
msg("<b>If you specify a radius, it must be at least 1."); throw new MassiveException().setMsg("<b>If you specify a radius, it must be at least 1.");
return null;
} }
// Radius Claim Max // Radius Claim Max
if (radius > MConf.get().setRadiusMax && ! msender.isOverriding()) if (radius > MConf.get().setRadiusMax && ! msender.isOverriding())
{ {
msg("<b>The maximum radius allowed is <h>%s<b>.", MConf.get().setRadiusMax); throw new MassiveException().setMsg("<b>The maximum radius allowed is <h>%s<b>.", MConf.get().setRadiusMax);
return null;
} }
return radius; return radius;
@ -54,7 +52,6 @@ public abstract class CmdFactionsSetXRadius extends CmdFactionsSetX
public Integer getRadiusZero() throws MassiveException public Integer getRadiusZero() throws MassiveException
{ {
Integer ret = this.getRadius(); Integer ret = this.getRadius();
if (ret == null) return ret;
return ret - 1; return ret - 1;
} }