Removal of assorted empty lines.

This commit is contained in:
MobiusDevelopment
2020-03-03 17:07:18 +00:00
parent ecaf8a1a66
commit 6d8addc784
14371 changed files with 304 additions and 44722 deletions

View File

@@ -100,7 +100,6 @@ public class Config
// Load rates config file (if exists)
final PropertiesParser ratesSettings = new PropertiesParser(RATES_CONFIG_FILE);
RATE_XP = ratesSettings.getFloat("RateXp", 1);
RATE_SP = ratesSettings.getFloat("RateSp", 1);
RATE_DROP = ratesSettings.getFloat("RateDrop", 1);
@@ -108,7 +107,6 @@ public class Config
// Load karma config file (if exists)
final PropertiesParser karmaSettings = new PropertiesParser(KARMA_CONFIG_FILE);
KARMA_MIN_KARMA = karmaSettings.getInt("KarmaMin", 240);
KARMA_MAX_KARMA = karmaSettings.getInt("KarmaMax", 10000);
KARMA_LOST_MULTIPLIER = karmaSettings.getFloat("KarmaLostMultiplier", 1);
@@ -117,13 +115,11 @@ public class Config
// Load threadpool config file (if exists)
final PropertiesParser threadpoolSettings = new PropertiesParser(THREADPOOL_CONFIG_FILE);
SCHEDULED_THREAD_POOL_COUNT = threadpoolSettings.getInt("ScheduledThreadPoolCount", 40);
INSTANT_THREAD_POOL_COUNT = threadpoolSettings.getInt("InstantThreadPoolCount", 20);
// Load NPC config file (if exists)
final PropertiesParser npcSettings = new PropertiesParser(NPC_CONFIG_FILE);
SHOW_NPC_LVL = npcSettings.getBoolean("ShowNpcLevel", false);
SHOW_NPC_AGGRESSION = npcSettings.getBoolean("ShowNpcAggression", false);
}

View File

@@ -953,7 +953,6 @@ public class PlayerInstance extends Creature
karmaLost = 1;
}
karmaLost *= Config.KARMA_LOST_MULTIPLIER;
if (_karma > karmaLost)
{
setKarma(_karma - (int) karmaLost);
@@ -972,7 +971,6 @@ public class PlayerInstance extends Creature
{
int newKarma = Config.KARMA_MIN_KARMA;
final int pkLevel = getLevel();
final int pkPKCount = getPkKills();
int pkCountMulti = 0;
if (pkPKCount > 0)
@@ -988,7 +986,6 @@ public class PlayerInstance extends Creature
pkCountMulti = 1;
}
newKarma *= pkCountMulti;
int lvlDiffMulti = 0;
if (pkLevel > level)
{
@@ -1003,7 +1000,6 @@ public class PlayerInstance extends Creature
lvlDiffMulti = 1;
}
newKarma *= lvlDiffMulti;
if (newKarma < Config.KARMA_MIN_KARMA)
{
newKarma = Config.KARMA_MIN_KARMA;
@@ -1471,7 +1467,6 @@ public class PlayerInstance extends Creature
{
Creature target = null;
target = getTarget() instanceof Creature ? (Creature) getTarget() : this;
if ((skill.getTargetType() == Skill.TARGET_SELF) || (skill.getTargetType() == Skill.TARGET_PARTY))
{
target = this;

View File

@@ -133,7 +133,6 @@ public class SystemPanel extends JPanel
final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
millis -= TimeUnit.MINUTES.toMillis(minutes);
final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
}
}

View File

@@ -37,9 +37,7 @@ public class Util
public static String printData(byte[] data, int len)
{
final StringBuilder result = new StringBuilder();
int counter = 0;
for (int i = 0; i < len; i++)
{
if ((counter % 16) == 0)
@@ -52,7 +50,6 @@ public class Util
if (counter == 16)
{
result.append(" ");
int charpoint = i - 15;
for (int a = 0; a < 16; a++)
{
@@ -103,12 +100,10 @@ public class Util
public static String fillHex(int data, int digits)
{
String number = Integer.toHexString(data);
for (int i = number.length(); i < digits; i++)
{
number = "0" + number;
}
return number;
}