mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 20:57:47 +00:00
Code Activity

Merged in skeletonhorn/ffxiv-classic-server-ai-fork/ai-open (pull request #4)

Browse source 
Minor changes to fix equipability bugs
This commit is contained in:
yogurt 2017-09-08 14:22:41 +00:00 • committed by Tahir Akhlaq
commit 9077c60b96
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -1936,7 +1936,9 @@ namespace FFXIVClassic_Map_Server.Actors
//If the returned value is outside the hotbar, it indicates it wasn't found. //If the returned value is outside the hotbar, it indicates it wasn't found.
private ushort FindFirstCommandSlotById(uint commandId) private ushort FindFirstCommandSlotById(uint commandId)
{ {
commandId |= 0xA0F00000; if(commandId != 0)
commandId |= 0xA0F00000;
ushort firstSlot = (ushort)(charaWork.commandBorder + 30); ushort firstSlot = (ushort)(charaWork.commandBorder + 30);
for (ushort i = charaWork.commandBorder; i < charaWork.commandBorder + 30; i++) for (ushort i = charaWork.commandBorder; i < charaWork.commandBorder + 30; i++)

3
sql/characters_hotbar.sql
View file

@ -23,13 +23,12 @@ DROP TABLE IF EXISTS `characters_hotbar`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */; /*!40101 SET character_set_client = utf8 */;
CREATE TABLE `characters_hotbar` ( CREATE TABLE `characters_hotbar` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`characterId` int(10) unsigned NOT NULL, `characterId` int(10) unsigned NOT NULL,
`classId` smallint(5) unsigned NOT NULL, `classId` smallint(5) unsigned NOT NULL,
`hotbarSlot` smallint(5) unsigned NOT NULL, `hotbarSlot` smallint(5) unsigned NOT NULL,
`commandId` int(10) unsigned NOT NULL, `commandId` int(10) unsigned NOT NULL,
`recastTime` int(10) unsigned DEFAULT NULL, `recastTime` int(10) unsigned DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`characterId`, `classId`, `hotbarSlot`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;