AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-09-08 03:29:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use isServerSide instead of conn.user != null (#1346)

Browse Source
This commit is contained in:
Krzysztof Wiśniewski 2025-04-26 09:40:06 +02:00 committed by GitHub
parent 05ab8a4a5b
commit 62d4bf6700
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network.zig
View File

@ -889,7 +889,7 @@ pub const Protocols = struct {
const y = try reader.readInt(i32); const y = try reader.readInt(i32);
const z = try reader.readInt(i32); const z = try reader.readInt(i32);
const newBlock = Block.fromInt(try reader.readInt(u32)); const newBlock = Block.fromInt(try reader.readInt(u32));
if(conn.user != null) { if(conn.isServerSide()) {
return error.InvalidPacket; return error.InvalidPacket;
} else { } else {
renderer.mesh_storage.updateBlock(x, y, z, newBlock); renderer.mesh_storage.updateBlock(x, y, z, newBlock);
@ -965,7 +965,7 @@ pub const Protocols = struct {
fn receive(conn: *Connection, reader: *utils.BinaryReader) !void { fn receive(conn: *Connection, reader: *utils.BinaryReader) !void {
switch(try reader.readEnum(UpdateType)) { switch(try reader.readEnum(UpdateType)) {
.gamemode => { .gamemode => {
if(conn.user != null) return error.InvalidPacket; if(conn.isServerSide()) return error.InvalidPacket;
main.items.Inventory.Sync.setGamemode(null, try reader.readEnum(main.game.Gamemode)); main.items.Inventory.Sync.setGamemode(null, try reader.readEnum(main.game.Gamemode));
}, },
.teleport => { .teleport => {
@ -1191,7 +1191,7 @@ pub const Protocols = struct {
conn.send(.fast, id, writer.data.items); conn.send(.fast, id, writer.data.items);
} }
pub fn sendConfirmation(conn: *Connection, _data: []const u8) void { pub fn sendConfirmation(conn: *Connection, _data: []const u8) void {
std.debug.assert(conn.user != null); std.debug.assert(conn.isServerSide());
var writer = utils.BinaryWriter.initCapacity(main.stackAllocator, _data.len + 1); var writer = utils.BinaryWriter.initCapacity(main.stackAllocator, _data.len + 1);
defer writer.deinit(); defer writer.deinit();
writer.writeInt(u8, 0xff); writer.writeInt(u8, 0xff);
@ -1199,11 +1199,11 @@ pub const Protocols = struct {
conn.send(.fast, id, writer.data.items); conn.send(.fast, id, writer.data.items);
} }
pub fn sendFailure(conn: *Connection) void { pub fn sendFailure(conn: *Connection) void {
std.debug.assert(conn.user != null); std.debug.assert(conn.isServerSide());
conn.send(.fast, id, &.{0xfe}); conn.send(.fast, id, &.{0xfe});
} }
pub fn sendSyncOperation(conn: *Connection, _data: []const u8) void { pub fn sendSyncOperation(conn: *Connection, _data: []const u8) void {
std.debug.assert(conn.user != null); std.debug.assert(conn.isServerSide());
var writer = utils.BinaryWriter.initCapacity(main.stackAllocator, _data.len + 1); var writer = utils.BinaryWriter.initCapacity(main.stackAllocator, _data.len + 1);
defer writer.deinit(); defer writer.deinit();
writer.writeInt(u8, 0); writer.writeInt(u8, 0);