lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced assignments with compound operators.

Browse Source
This commit is contained in:
MobiusDev
2018-09-09 16:47:22 +00:00
parent b50b43a1f9
commit 96a39e7b73
127 changed files with 923 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java
View File

@ -187,7 +187,7 @@ public class LoginServerThread extends Thread
while ((newBytes != -1) && (receivedBytes < (length - 2)))
{
newBytes = in.read(incoming, receivedBytes, left);
receivedBytes = receivedBytes + newBytes;
receivedBytes += newBytes;
left -= newBytes;
}

16
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java
View File

@ -125,7 +125,7 @@ public class FriendlyNpcAI extends L2AttackableAI
int newX = combinedCollision + Rnd.get(40);
if (Rnd.nextBoolean())
{
newX = originalAttackTarget.getX() + newX;
newX += originalAttackTarget.getX();
}
else
{
@ -134,7 +134,7 @@ public class FriendlyNpcAI extends L2AttackableAI
int newY = combinedCollision + Rnd.get(40);
if (Rnd.nextBoolean())
{
newY = originalAttackTarget.getY() + newY;
newY += originalAttackTarget.getY();
}
else
{
@ -167,20 +167,20 @@ public class FriendlyNpcAI extends L2AttackableAI
if (originalAttackTarget.getX() < posX)
{
posX = posX + 300;
posX += 300;
}
else
{
posX = posX - 300;
posX -= 300;
}
if (originalAttackTarget.getY() < posY)
{
posY = posY + 300;
posY += 300;
}
else
{
posY = posY - 300;
posY -= 300;
}
if (GeoEngine.getInstance().canMoveToTarget(npc.getX(), npc.getY(), npc.getZ(), posX, posY, posZ, npc.getInstanceWorld()))
@ -197,10 +197,10 @@ public class FriendlyNpcAI extends L2AttackableAI
int range = npc.getPhysicalAttackRange() + combinedCollision;
if (originalAttackTarget.isMoving())
{
range = range + 50;
range += 50;
if (npc.isMoving())
{
range = range + 50;
range += 50;
}
}

12
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@ -757,7 +757,7 @@ public class L2AttackableAI extends L2CharacterAI
int newX = combinedCollision + Rnd.get(40);
if (Rnd.nextBoolean())
{
newX = target.getX() + newX;
newX += target.getX();
}
else
{
@ -766,7 +766,7 @@ public class L2AttackableAI extends L2CharacterAI
int newY = combinedCollision + Rnd.get(40);
if (Rnd.nextBoolean())
{
newY = target.getY() + newY;
newY += target.getY();
}
else
{
@ -799,20 +799,20 @@ public class L2AttackableAI extends L2CharacterAI
if (target.getX() < posX)
{
posX = posX + 300;
posX += 300;
}
else
{
posX = posX - 300;
posX -= 300;
}
if (target.getY() < posY)
{
posY = posY + 300;
posY += 300;
}
else
{
posY = posY - 300;
posY -= 300;
}
if (GeoEngine.getInstance().canMoveToTarget(npc.getX(), npc.getY(), npc.getZ(), posX, posY, posZ, npc.getInstanceWorld()))

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/idfactory/StackIDFactory.java
View File

@ -132,7 +132,7 @@ public class StackIDFactory extends IdFactory
else
{
id = _curOID;
_curOID = _curOID + 1;
_curOID += 1;
}
return id;
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -813,7 +813,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
int heading = Util.calculateHeadingFrom(this, target) - _heading;
if (heading < 0)
{
heading = 65535 + heading;
heading += 65535;
}
return Util.convertHeadingToDegree(heading);
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java
View File

@ -102,7 +102,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
public void onReceiveFood()
{
// Eating food extends the duration by 20secs, to a max of 20minutes
_remainingTime = _remainingTime + DURATION_INCREASE_INTERVAL;
_remainingTime += DURATION_INCREASE_INTERVAL;
if (_remainingTime > MAX_DURATION)
{
_remainingTime = MAX_DURATION;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Hero.java
View File

@ -199,7 +199,7 @@ public class Hero
private String calcFightTime(long FightTime)
{
final String format = String.format("%%0%dd", 2);
FightTime = FightTime / 1000;
FightTime /= 1000;
final String seconds = String.format(format, FightTime % 60);
final String minutes = String.format(format, (FightTime % 3600) / 60);
return minutes + ":" + seconds;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@ -256,7 +256,7 @@ public final class Formulas
// Autoattack critical depends on level difference at high levels as well.
if ((activeChar.getLevel() >= 78) || (target.getLevel() >= 78))
{
rate = rate + (Math.sqrt(activeChar.getLevel()) * (activeChar.getLevel() - target.getLevel()) * 0.125);
rate += (Math.sqrt(activeChar.getLevel()) * (activeChar.getLevel() - target.getLevel()) * 0.125);
}
// Autoattack critical rate is limited between 3%-97%.

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java
View File

@ -112,13 +112,13 @@ public class ZoneCuboid extends L2ZoneForm
final int _y2 = _r.y + _r.height;
// x1->x2
for (int x = _x1; x < _x2; x = x + STEP)
for (int x = _x1; x < _x2; x += STEP)
{
dropDebugItem(Inventory.ADENA_ID, 1, x, _y1, z);
dropDebugItem(Inventory.ADENA_ID, 1, x, _y2, z);
}
// y1->y2
for (int y = _y1; y < _y2; y = y + STEP)
for (int y = _y1; y < _y2; y += STEP)
{
dropDebugItem(Inventory.ADENA_ID, 1, _x1, y, z);
dropDebugItem(Inventory.ADENA_ID, 1, _x2, y, z);

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Util.java
View File

@ -87,7 +87,7 @@ public final class Util
double angleTarget = Math.toDegrees(Math.atan2(toY - fromY, toX - fromX));
if (angleTarget < 0)
{
angleTarget = 360 + angleTarget;
angleTarget += 360;
}
return angleTarget;
}
@ -127,7 +127,7 @@ public final class Util
double angleTarget = Math.toDegrees(Math.atan2(toY - fromY, toX - fromX));
if (angleTarget < 0)
{
angleTarget = 360 + angleTarget;
angleTarget += 360;
}
return (int) (angleTarget * 182.044444444);
}
@ -137,7 +137,7 @@ public final class Util
double angleTarget = Math.toDegrees(Math.atan2(dy, dx));
if (angleTarget < 0)
{
angleTarget = 360 + angleTarget;
angleTarget += 360;
}
return (int) (angleTarget * 182.044444444);
}