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

Sync with L2jServer HighFive Jun 19th 2015.

Browse Source
This commit is contained in:
MobiusDev 2015-06-19 20:55:34 +00:00
parent 1cfd98106f
commit 3aa3d672d7
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java vendored
View File

@ -150,6 +150,7 @@ public final class DisciplesNecropolisPast extends AbstractInstance
private synchronized void checkDoors(L2Npc npc, DNPWorld world)
{
world.countKill++;
switch (world.countKill)
{
case 4:
@ -380,7 +381,6 @@ public final class DisciplesNecropolisPast extends AbstractInstance
if (tmpworld instanceof DNPWorld)
{
final DNPWorld world = (DNPWorld) tmpworld;
world.countKill++;
checkDoors(npc, world);
}

6
trunk/java/com/l2jserver/gameserver/LoginServerThread.java
View File

@ -73,6 +73,7 @@ import com.l2jserver.gameserver.network.loginserverpackets.RequestCharacters;
import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
import com.l2jserver.gameserver.network.serverpackets.LoginFail;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.Rnd;
import com.l2jserver.util.Util;
import com.l2jserver.util.crypt.NewCrypt;
import com.l2jserver.util.network.BaseSendablePacket;
@ -167,6 +168,11 @@ public class LoginServerThread extends Thread
// init Blowfish
byte[] blowfishKey = Util.generateHex(40);
// Protect the new blowfish key what cannot begin with zero
if (blowfishKey[0] == 0)
{
blowfishKey[0] = (byte) Rnd.get(32, 64);
}
_blowfish = new NewCrypt("_;v.]05-31!|+-%xT!^[$\00");
while (!isInterrupted())
{

3
trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java
View File

@ -1682,7 +1682,8 @@ public final class Formulas
attack_attribute_mod = 0.06909;
defence_attribute_mod = 0.078;
}
else if (attack_attribute >= 350)
// On retail else if (attack_attribute >= 350), can be considered a typo
else if (defence_attribute >= 350)
{
attack_attribute_mod = 0.0887;
defence_attribute_mod = 0.1007;