Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance

Conflicts: src/resources/objects/SWGObject.java
2026-07-31 00:15:48 -04:00 · 2015-06-20 15:22:57 -05:00
parent b3f9b51485 6366c0b208
commit a3bbc5676a
35 changed files with 975 additions and 556 deletions
@@ -493,7 +493,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
 		if (volume == null)
 			return 0;
 		try {
-			return Integer.valueOf(volume.toString());
+			return Integer.parseInt(volume.toString());
 		} catch (NumberFormatException e) {
 			return 0;
 		}