X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2Fnet.cpp;h=38224ec9a57e879e2a84357a77456b30253f3f1c;hb=150d065f431d665326fd8028748c48a74ad956bb;hp=bb42979aed1d39f65d533c0cbdc20fab05b86cfa;hpb=eba29c8ad489194cd1e3cd64b5f23424ad4384ef;p=blank.git

diff --git a/src/server/net.cpp b/src/server/net.cpp
index bb42979..38224ec 100644
--- a/src/server/net.cpp
+++ b/src/server/net.cpp
@@ -247,7 +247,6 @@ void ClientConnection::Update(int dt) {
 		}
 		SendUpdates();
 
-		input->Update(dt);
 		CheckPlayerFix();
 		CheckChunkQueue();
 	}
@@ -317,10 +316,12 @@ void ClientConnection::QueueUpdate(SpawnStatus &status) {
 }
 
 void ClientConnection::SendUpdates() {
+	auto base = PlayerChunks().Base();
 	auto pack = Prepare<Packet::EntityUpdate>();
+	pack.WriteChunkBase(base);
 	int entity_pos = 0;
 	for (SpawnStatus *status : entity_updates) {
-		pack.WriteEntity(*status->entity, entity_pos);
+		pack.WriteEntity(*status->entity, base, entity_pos);
 		++entity_pos;
 		if (entity_pos == Packet::EntityUpdate::MAX_ENTITIES) {
 			pack.WriteEntityCount(entity_pos);
@@ -431,12 +432,17 @@ void ClientConnection::AttachPlayer(Player &player) {
 		GetPlayerModel().Instantiate(PlayerEntity().GetModel());
 	}
 
-	cout << "player \"" << player.Name() << "\" joined" << endl;
+	string msg = "player \"" + player.Name() + "\" joined";
+	cout << msg << endl;
+	server.DistributeMessage(0, 0, msg);
 }
 
 void ClientConnection::DetachPlayer() {
 	if (!HasPlayer()) return;
-	cout << "player \"" << input->GetPlayer().Name() << "\" left" << endl;
+	string msg = "player \"" + input->GetPlayer().Name() + "\" left";
+	cout << msg << endl;
+	server.DistributeMessage(0, 0, msg);
+
 	server.GetWorldSave().Write(input->GetPlayer());
 	PlayerEntity().Kill();
 	PlayerEntity().UnRef();
@@ -543,21 +549,17 @@ void ClientConnection::On(const Packet::PlayerUpdate &pack) {
 		return;
 	}
 	glm::vec3 movement(0.0f);
-	float pitch = 0.0f;
-	float yaw = 0.0f;
 	uint8_t new_actions;
 	uint8_t slot;
 
 	player_update_pack = pack.Seq();
 	pack.ReadPredictedState(player_update_state);
 	pack.ReadMovement(movement);
-	pack.ReadPitch(pitch);
-	pack.ReadYaw(yaw);
 	pack.ReadActions(new_actions);
 	pack.ReadSlot(slot);
 
 	input->SetMovement(movement);
-	input->TurnHead(pitch - input->GetPitch(), yaw - input->GetYaw());
+	input->TurnHead(player_update_state.pitch - input->GetPitch(), player_update_state.yaw - input->GetYaw());
 	input->SelectInventory(slot);
 
 	if ((new_actions & 0x01) && !(old_actions & 0x01)) {
@@ -582,6 +584,19 @@ bool ClientConnection::ChunkInRange(const glm::ivec3 &pos) const noexcept {
 	return HasPlayer() && PlayerChunks().InRange(pos);
 }
 
+void ClientConnection::On(const Packet::Message &pack) {
+	uint8_t type;
+	uint32_t ref;
+	string msg;
+	pack.ReadType(type);
+	pack.ReadReferral(ref);
+	pack.ReadMessage(msg);
+
+	if (type == 1 && HasPlayer()) {
+		server.DistributeMessage(1, PlayerEntity().ID(), msg);
+	}
+}
+
 
 Server::Server(
 	const Config::Network &conf,
@@ -709,5 +724,20 @@ void Server::SetBlock(Chunk &chunk, int index, const Block &block) {
 	}
 }
 
+void Server::DistributeMessage(uint8_t type, uint32_t ref, const string &msg) {
+	auto pack = Packet::Make<Packet::Message>(serv_pack);
+	pack.WriteType(type);
+	pack.WriteReferral(ref);
+	pack.WriteMessage(msg);
+	serv_pack.len = sizeof(Packet::Header) + Packet::Message::GetSize(msg);
+	SendAll();
+}
+
+void Server::SendAll() {
+	for (ClientConnection &client : clients) {
+		client.GetConnection().Send(serv_pack, serv_sock);
+	}
+}
+
 }
 }