From bdc0fc5a88f5db2a6b7638fa20b363465d8fb78e Mon Sep 17 00:00:00 2001
From: ksh <kshman@msn.com>
Date: Tue, 14 Dec 2021 13:43:07 +0900
Subject: [PATCH] 6.0 Bozja CE tested (#60)

---
 Data/DcPacket-Global.config |  4 ++--
 Tab/DutyForm.cs             | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Data/DcPacket-Global.config b/Data/DcPacket-Global.config
index f231456..993fe37 100644
--- a/Data/DcPacket-Global.config
+++ b/Data/DcPacket-Global.config
@@ -1,11 +1,11 @@
 # DutyPacket configuration
 
 # packet
-Version=2006000
+Version=2006001
 Description=6.0 (JP/NA/EU/OC)
 OpFate=742
 OpDuty=226
 OpMatch=791
 OpInstance=213
 OpZone=144
-OpSouthernBozja=0
+OpSouthernBozja=187
diff --git a/Tab/DutyForm.cs b/Tab/DutyForm.cs
index e99eb6b..9e0d227 100644
--- a/Tab/DutyForm.cs
+++ b/Tab/DutyForm.cs
@@ -20,6 +20,7 @@ namespace DutyContent.Tab
 		//
 		private bool _is_lock_fate;
 		private ushort _last_fate = 0;
+		private ushort _last_zone = 0;
 
 		//
 		private bool _is_packet_finder;
@@ -362,17 +363,21 @@ namespace DutyContent.Tab
 			{
 				var zone = BitConverter.ToUInt16(data, 4);
 
-				ResetContentItems();
+				if (zone != _last_zone)
+				{
+					_last_zone = zone;
+					ResetContentItems();
+				}
 			}
 
 			// save the queen critical engagement
-			else if (opcode == DcConfig.Packet.OpCe)
+			else if (DcConfig.Packet.OpCe != 0 && opcode == DcConfig.Packet.OpCe)
 			{
 				//  0[4] timestamp
 				//  4[2] mmss
 				//  6[2] ?
 				//  8[1] code
-				//  9[1] ?
+				//  9[1] members
 				// 10[1] status 0=end, 1=register, 2=entry, 3=progress
 				// 12[1] progress percentage
 
@@ -1527,10 +1532,10 @@ namespace DutyContent.Tab
 					return;
 				}
 
+				var ok = false;
+				var mem = data[9];
 				var stat = data[10];
 				var prg = data[12];
-				var mem = data[9];
-				var ok = false;
 
 				/*
 				if (stat == 0)