Sync with L2jServer HighFive Jun 19th 2015.

trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java

@@ -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);
 		}
 		

trunk/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -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())
 				{

trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -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;