From b06b0fb08c5c12eae210a99a7066e65ff08b4957 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sat, 16 Nov 2019 10:59:35 +0800
Subject: [PATCH] Merge fixes

---
 .../r2_shard/data_shard/mirror_sheets/fe_temp.dataset | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/server/r2_shard/data_shard/mirror_sheets/fe_temp.dataset b/code/ryzom/server/r2_shard/data_shard/mirror_sheets/fe_temp.dataset
index cb75f90a4..22d12008f 100644
--- a/code/ryzom/server/r2_shard/data_shard/mirror_sheets/fe_temp.dataset
+++ b/code/ryzom/server/r2_shard/data_shard/mirror_sheets/fe_temp.dataset
@@ -292,14 +292,14 @@
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpMode"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint16"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpClan"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint32"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
@@ -339,6 +339,13 @@
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
       </STRUCT>
+      <STRUCT>
+        <ATOM Name="name" Value="NPCAlias"/>
+        <ATOM Name="type" Value="uint32"/>
+        <ATOM Name="persistant" Value="false"/>
+        <ATOM Name="mirror" Value="true"/>
+        <ATOM Name="weight" Value="1"/>
+      </STRUCT>
     </ARRAY>
     <ATOM Name="max number of rows or entities" Value="15000"/>
     <ARRAY Name="entity types">