Move ZoneId to world

src/common.rs

@@ -123,10 +123,3 @@ lu_wstr!(LuWStr256, 256);
 
 pub type ObjId = u64;
 pub const OBJID_EMPTY: u64 = 0;
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct ZoneId {
-	pub map_id: u16,
-	pub instance_id: u16,
-	pub clone_id: u32,
-}

src/world/client/mod.rs

@@ -4,7 +4,8 @@ use endio::{LEWrite, Serialize};
 use endio::LittleEndian as LE;
 use lu_packets_derive::{FromVariants, ServiceMessageS};
 
-use crate::common::{ObjId, LuWStr33, ZoneId};
+use crate::common::{ObjId, LuWStr33};
+use super::ZoneId;
 
 pub type LuMessage = crate::general::client::LuMessage<ClientMessage>;
 pub type Message = crate::raknet::client::Message<LuMessage>;

src/world/mod.rs

@@ -11,6 +11,13 @@ use lu_packets_derive::GmParam;
 type Lot = u32;
 const LOT_NULL: Lot = -1i32 as Lot;
 
+#[derive(Debug, Deserialize, Serialize)]
+pub struct ZoneId {
+	pub map_id: u16,
+	pub instance_id: u16,
+	pub clone_id: u32,
+}
+
 #[derive(Debug, Deserialize, Serialize, PartialEq, GmParam)]
 pub struct Vector3 {
 	pub x: f32,

src/world/server/mod.rs

@@ -8,8 +8,9 @@ use endio::{Deserialize, LERead, LEWrite, Serialize};
 use endio::LittleEndian as LE;
 use lu_packets_derive::ServiceMessageD;
 
-use crate::common::{err, ObjId, LuWStr33, LuWStr42, ServiceId, ZoneId};
+use crate::common::{err, ObjId, LuWStr33, LuWStr42, ServiceId};
 use crate::chat::server::ChatMessage;
+use super::ZoneId;
 use self::gm::SubjectGameMessage;
 
 pub use crate::general::server::GeneralMessage;