diff --git a/sql/land.sql b/sql/land.sql new file mode 100644 index 00000000..d4b918af --- /dev/null +++ b/sql/land.sql @@ -0,0 +1,15 @@ +CREATE TABLE `land` ( + `LandSetId` INT UNSIGNED NULL, + `LandId` INT UNSIGNED NULL, + `Size` SMALLINT NULL, + `Status` SMALLINT NULL, + `LandPrice` BIGINT NULL, + `UpdateTime` BIGINT NULL, + `OwnerId` BIGINT UNSIGNED NULL, + `HouseId` BIGINT UNSIGNED NULL, + `IS_DELETE` SMALLINT NULL DEFAULT '0', + `IS_NOT_ACTIVE_FLG` SMALLINT NULL DEFAULT '0', + `UPDATE_DATE` DATETIME NULL +) +COLLATE='latin1_swedish_ci' +ENGINE=InnoDB; diff --git a/sql/landset.sql b/sql/landset.sql new file mode 100644 index 00000000..4ff05e52 --- /dev/null +++ b/sql/landset.sql @@ -0,0 +1,68 @@ +CREATE TABLE `landset` ( + `LandSetId` INT UNSIGNED NULL, + `LandId_0` INT UNSIGNED NULL, + `LandId_1` INT UNSIGNED NULL, + `LandId_2` INT UNSIGNED NULL, + `LandId_3` INT UNSIGNED NULL, + `LandId_4` INT UNSIGNED NULL, + `LandId_5` INT UNSIGNED NULL, + `LandId_6` INT UNSIGNED NULL, + `LandId_7` INT UNSIGNED NULL, + `LandId_8` INT UNSIGNED NULL, + `LandId_9` INT UNSIGNED NULL, + `LandId_10` INT UNSIGNED NULL, + `LandId_11` INT UNSIGNED NULL, + `LandId_12` INT UNSIGNED NULL, + `LandId_13` INT UNSIGNED NULL, + `LandId_14` INT UNSIGNED NULL, + `LandId_15` INT UNSIGNED NULL, + `LandId_16` INT UNSIGNED NULL, + `LandId_17` INT UNSIGNED NULL, + `LandId_18` INT UNSIGNED NULL, + `LandId_19` INT UNSIGNED NULL, + `LandId_20` INT UNSIGNED NULL, + `LandId_21` INT UNSIGNED NULL, + `LandId_22` INT UNSIGNED NULL, + `LandId_23` INT UNSIGNED NULL, + `LandId_24` INT UNSIGNED NULL, + `LandId_25` INT UNSIGNED NULL, + `LandId_26` INT UNSIGNED NULL, + `LandId_27` INT UNSIGNED NULL, + `LandId_28` INT UNSIGNED NULL, + `LandId_29` INT UNSIGNED NULL, + `LandId_30` INT UNSIGNED NULL, + `LandId_31` INT UNSIGNED NULL, + `LandId_32` INT UNSIGNED NULL, + `LandId_33` INT UNSIGNED NULL, + `LandId_34` INT UNSIGNED NULL, + `LandId_35` INT UNSIGNED NULL, + `LandId_36` INT UNSIGNED NULL, + `LandId_37` INT UNSIGNED NULL, + `LandId_38` INT UNSIGNED NULL, + `LandId_39` INT UNSIGNED NULL, + `LandId_40` INT UNSIGNED NULL, + `LandId_41` INT UNSIGNED NULL, + `LandId_42` INT UNSIGNED NULL, + `LandId_43` INT UNSIGNED NULL, + `LandId_44` INT UNSIGNED NULL, + `LandId_45` INT UNSIGNED NULL, + `LandId_46` INT UNSIGNED NULL, + `LandId_47` INT UNSIGNED NULL, + `LandId_48` INT UNSIGNED NULL, + `LandId_49` INT UNSIGNED NULL, + `LandId_50` INT UNSIGNED NULL, + `LandId_51` INT UNSIGNED NULL, + `LandId_52` INT UNSIGNED NULL, + `LandId_53` INT UNSIGNED NULL, + `LandId_54` INT UNSIGNED NULL, + `LandId_55` INT UNSIGNED NULL, + `LandId_56` INT UNSIGNED NULL, + `LandId_57` INT UNSIGNED NULL, + `LandId_58` INT UNSIGNED NULL, + `LandId_59` INT UNSIGNED NULL, + `IS_DELETE` SMALLINT NULL DEFAULT '0', + `IS_NOT_ACTIVE_FLG` SMALLINT NULL DEFAULT '0', + `UPDATE_DATE` DATETIME NULL +) +COLLATE='latin1_swedish_ci' +ENGINE=InnoDB; diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 50ed43d8..18c4042d 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -456,6 +456,12 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R player.sendUrgent( "No zone instance found for " + std::to_string( param1 ) ); break; } + + if( !pTeriMgr->isDefaultTerritory( param1 ) ) + { + player.sendUrgent( pZone->getName() + " is an instanced area - instance ID required to zone in." ); + break; + } bool doTeleport = false; uint16_t teleport; diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h index 3ecebdfd..c78e3923 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h @@ -29,7 +29,7 @@ class TerritoryMgr public: enum TerritoryIntendedUse : - uint8_t //ToDo: Add The Rest of The Territory Types and Have Better Names For Them + uint8_t //TODO: Add the rest of the territory types and have better names for them { Town = 0, OpenWorld = 1,