Merge pull request #14 from jurchiks/upstream-1

Fix for http://www.l2jserver.com/forum/viewtopic.php?f=77&t=30681

L2J_DataPack/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java

@@ -111,10 +111,10 @@ public final class Q00211_TrialOfTheChallenger extends Quest
 				if (qs.isCreated())
 				{
 					final PlayerVariables vars = player.getVariables();
-					if (!vars.getBoolean("2ND_CLASS_DIAMOND_REWARD", false))
+					if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
 					{
 						giveItems(player, DIMENSIONAL_DIAMONDS);
-						vars.set("2ND_CLASS_DIAMOND_REWARD", true);
+						vars.set("2ND_CLASS_DIAMOND_REWARD", 1);
 						htmltext = event;
 					}
 					else
@@ -339,10 +339,10 @@ public final class Q00211_TrialOfTheChallenger extends Quest
 						
 						// redundant retail check - already rewarded at beginning of quest
 						final PlayerVariables vars = talker.getVariables();
-						if (!vars.getBoolean("2ND_CLASS_DIAMOND_REWARD", false))
+						if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
 						{
 							giveItems(talker, DIMENSIONAL_DIAMONDS);
-							vars.set("2ND_CLASS_DIAMOND_REWARD", true);
+							vars.set("2ND_CLASS_DIAMOND_REWARD", 1);
 						}
 						
 						talker.sendPacket(new SocialAction(talker.getObjectId(), 3));

L2J_DataPack/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java

@@ -570,7 +570,7 @@ public final class Q00212_TrialOfDuty extends Quest
 	{
 		final PlayerVariables vars = player.getVariables();
 		
-		if (!vars.getBoolean("2ND_CLASS_DIAMOND_REWARD", false))
+		if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
 		{
 			if (player.getClassId() == ClassId.knight)
 			{
@@ -581,7 +581,7 @@ public final class Q00212_TrialOfDuty extends Quest
 				rewardItems(player, DIMENSIONAL_DIAMOND, 61);
 			}
 			
-			vars.set("2ND_CLASS_DIAMOND_REWARD", true);
+			vars.set("2ND_CLASS_DIAMOND_REWARD", 1);
 			return true;
 		}
 		return false;

L2J_DataPack/dist/sql/game/updates/20141224update.sql

@@ -0,0 +1 @@
+UPDATE `character_quests` SET `value` = '1' WHERE `var` = '2ND_CLASS_DIAMOND_REWARD' AND `value` = 'true';