majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
lukas0008
2024-08-12 20:35:07 +02:00
parent 5d6c38d1b2
commit 7a5984984f
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -1169,6 +1169,7 @@ dependencies = [
"aes",
"bytes",
"cfb8",
"fastnbt",
"flate2",
"itertools",
"log",

2
pumpkin-protocol/Cargo.toml
View File

@@ -28,4 +28,4 @@ aes = "0.8.4"
cfb8 = "0.8.1"
take_mut = "0.2.2"
itertools = "0.13.0"
fastnbt = "2.5.0"
fastnbt = { git = "https://github.com/owengage/fastnbt.git" }

10
pumpkin/src/server.rs
View File

@@ -16,15 +16,13 @@ use pumpkin_protocol::{
bytebuf::ByteBuffer, client::{
config::CPluginMessage,
play::{
CCenterChunk, CChunkData, CChunkDataUpdateLight, CGameEvent, CLogin, CPlayerAbilities,
CPlayerInfoUpdate, CRemoveEntities, CSpawnEntity, PlayerAction,
CCenterChunk, CChunkData, CChunkDataUpdateLight, CGameEvent, CLogin, CPlayerAbilities, CPlayerInfoUpdate, CRemoveEntities, CRemovePlayerInfo, CSetEntityMetadata, CSpawnEntity, Metadata, PlayerAction
},
}, BitSet, ClientPacket, Players, Sample, StatusResponse, VarInt, Version, CURRENT_MC_PROTOCOL
}, uuid::UUID, BitSet, ClientPacket, Players, Sample, StatusResponse, VarInt, Version, CURRENT_MC_PROTOCOL
};
use pumpkin_world::dimension::Dimension;
use pumpkin_registry::Registry;
use pumpkin_world::chunk::TestChunk;
use rsa::{traits::PublicKeyParts, RsaPrivateKey, RsaPublicKey};
use serde::{Deserialize, Serialize};
@@ -337,7 +335,7 @@ impl Server {
.read_chunks(wanted_chunks)
.await;
client.send_packet(CCenterChunk {
client.send_packet(&CCenterChunk {
chunk_x: 0.into(),
chunk_z: 0.into(),
});
@@ -354,7 +352,7 @@ impl Server {
"Chunk loading failed for chunk ({},{}): {}",
chunk.0 .0, chunk.0 .1, err
),
Ok(data) => client.send_packet(CChunkData(data)),
Ok(data) => client.send_packet(&CChunkData(data)),
}});