Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add permissions check for SSetCreativeSlot #51

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Add permissions check for SSetCreativeSlot #51

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bbe19f
make sure the players gamemode is creative when client sends SSetCrea…
Bryntet Aug 21, 2024
dda2958
fix kick message
Bryntet Aug 21, 2024
e34fc47
refactor out double call to self.player
Bryntet Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pumpkin/src/client/player_packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,10 @@ impl Client {
}

pub fn handle_set_creative_slot(&mut self, _server: &mut Server, packet: SSetCreativeSlot) {
let gamemode = self.player.as_ref().unwrap().gamemode;
if gamemode != GameMode::Creative {
self.kick("CHEATER")
Bryntet marked this conversation as resolved.
Show resolved Hide resolved
}
let inventory = &mut self.player.as_mut().unwrap().inventory;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we should &mut self.player.as_mut() twice when we also could just do it once ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because the borrow checker yells at me if i try to have a mut ref to player (that gets used later, so it can't be dropped) when doing self.kick (which requires &mut)


inventory.set_slot(packet.slot as usize, packet.clicked_item.to_item(), false);
Expand Down