From 163f240cf9d62bd87bed071f8021f5f052675015 Mon Sep 17 00:00:00 2001
From: Filip Maj <filipmaj@gmail.com>
Date: Mon, 6 May 2019 14:34:59 -0400
Subject: [PATCH] Removed isExclusive as it is now loaded from gamedata.
 Cleaned up keys for retainer inventory.

---
 FFXIVClassic Map Server/Database.cs                   | 4 ----
 FFXIVClassic Map Server/actors/chara/player/Player.cs | 4 ----
 sql/characters.sql                                    | 2 +-
 sql/retainers_inventory.sql                           | 7 +++----
 sql/server_items.sql                                  | 2 +-
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/FFXIVClassic Map Server/Database.cs b/FFXIVClassic Map Server/Database.cs
index c90ef0e8..012ee8c2 100644
--- a/FFXIVClassic Map Server/Database.cs	
+++ b/FFXIVClassic Map Server/Database.cs	
@@ -1227,7 +1227,6 @@ namespace FFXIVClassic_Map_Server
                                     itemId,
                                     server_items_modifiers.id AS modifierId,
                                     quantity,
-                                    isExclusive,
                                     quality,
 
                                     durability,
@@ -1379,7 +1378,6 @@ namespace FFXIVClassic_Map_Server
                                     itemId,
                                     server_items_modifiers.id AS modifierId,
                                     quantity,
-                                    isExclusive,
                                     quality,
 
                                     durability,
@@ -1448,7 +1446,6 @@ namespace FFXIVClassic_Map_Server
                                     itemId,
                                     server_items_modifiers.id AS modifierId,
                                     quantity,
-                                    isExclusive,
                                     quality,
 
                                     durability,
@@ -1548,7 +1545,6 @@ namespace FFXIVClassic_Map_Server
                                     itemId,
                                     server_items_modifiers.id AS modifierId,
                                     quantity,
-                                    isExclusive,
                                     quality,
 
                                     durability,
diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs
index 6a28e76c..88da6042 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Player.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs	
@@ -7,18 +7,14 @@ using FFXIVClassic_Map_Server.lua;
 using FFXIVClassic_Map_Server.packets.send;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server.packets.send.events;
-using FFXIVClassic_Map_Server.packets.send.actor.events;
 using FFXIVClassic_Map_Server.packets.send.actor.inventory;
-using FFXIVClassic_Map_Server.packets.send.events;
 using FFXIVClassic_Map_Server.packets.send.player;
 using FFXIVClassic_Map_Server.utils;
 using System;
 using System.Collections.Generic;
 using MoonSharp.Interpreter;
 using FFXIVClassic_Map_Server.packets.receive.events;
-using FFXIVClassic_Map_Server.packets.send.actor.inventory;
 using FFXIVClassic_Map_Server.actors.group;
-using FFXIVClassic_Map_Server.packets.send.group;
 using FFXIVClassic_Map_Server.packets.WorldPackets.Send.Group;
 using FFXIVClassic_Map_Server.actors.chara.npc;
 
diff --git a/sql/characters.sql b/sql/characters.sql
index 78213547..2bd1102e 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -48,4 +48,4 @@ CREATE TABLE `characters` (
   `homepoint` int(10) unsigned NOT NULL DEFAULT '0',
   `homepointInn` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=166 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
diff --git a/sql/retainers_inventory.sql b/sql/retainers_inventory.sql
index 29b6d8e1..15f62160 100644
--- a/sql/retainers_inventory.sql
+++ b/sql/retainers_inventory.sql
@@ -12,12 +12,11 @@ SET FOREIGN_KEY_CHECKS=0;
 -- Table structure for retainers_inventory
 -- ----------------------------
 CREATE TABLE `retainers_inventory` (
-  `id` int(10) unsigned zerofill NOT NULL AUTO_INCREMENT,
   `retainerId` int(10) unsigned NOT NULL,
-  `itemPackage` smallint(5) unsigned NOT NULL DEFAULT '0',
   `serverItemId` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`,`retainerId`)
-) ENGINE=InnoDB AUTO_INCREMENT=345 DEFAULT CHARSET=utf8;
+  `itemPackage` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`retainerId`,`serverItemId`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records 
diff --git a/sql/server_items.sql b/sql/server_items.sql
index 7239327f..095b491e 100644
--- a/sql/server_items.sql
+++ b/sql/server_items.sql
@@ -20,7 +20,7 @@ CREATE TABLE `server_items` (
   `isAttached` tinyint(1) unsigned DEFAULT '0',
   `isDealing` tinyint(1) unsigned DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2659 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records