Skip to content

Implement survival mode #214

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

Merged
caelunshun merged 14 commits into from
May 11, 2020
Merged

Implement survival mode #214

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ff4990b
Split gamemode components to use an idiomatic ECS approach
caelunshun May 7, 2020
07372c8
Generate hardness values for blocks
caelunshun May 7, 2020
0ff0fe9
Prototype feather-definitions
caelunshun May 7, 2020
7071d32
Get feather-definitions to work; integrate it into feather-blocks
caelunshun May 9, 2020
b3184e2
Transition feather-items to utilize feather-definitions
caelunshun May 9, 2020
48feca2
Fix gamemode not displaying correctly; fix block placement
caelunshun May 9, 2020
db0be65
Initial support for survival mode block breaking
caelunshun May 9, 2020
340dd42
Improve handling of digging: support tools, proper hardness
caelunshun May 10, 2020
e106a85
Initial work on survival mode inventory handling
caelunshun May 11, 2020
9fb3dac
Fix bugs in implementation of handle_single_click
caelunshun May 11, 2020
e5f595f
Implement stubs for other Click Window actions
caelunshun May 11, 2020
ef21971
Fix CI build on Windows (caused by path handling errors)
caelunshun May 11, 2020
c2a46f5
Use Result instead of Option for Inventory::item_at
caelunshun May 11, 2020
8c486b3
Switch feather-definitions to build manually
caelunshun May 11, 2020
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
Prev Previous commit
Next Next commit
Fix bugs in implementation of handle_single_click
  • Loading branch information
@caelunshun
caelunshun committed May 11, 2020
commit 9fb3dac045c0c60193a51a4e501ded63cda16aa2
23 changes: 18 additions & 5 deletions server/player/src/packet_handlers/inventory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,24 @@ fn handle_single_click(
}
} else {
// Pick up the item in the slot
let mut inv = world.get_mut::<Inventory>(player);
let _ = inv.clear_item_at(packet.slot as SlotIndex);
if let Some(item) = inv.item_at(packet.slot as SlotIndex).flatten() {
drop(inv);
world.add(player, PickedItem(item)).unwrap();
let picked_up = world
.get::<Inventory>(player)
.item_at(packet.slot as SlotIndex)
.flatten();
let mut count = picked_up.map(|item| item.amount).unwrap_or(0);
if button == MouseButton::Right {
count = (count + 1) / 2;
}
if let Some(item) = picked_up {
world
.add(player, PickedItem(ItemStack::new(item.ty, count)))
.unwrap();

let mut inv = world.get_mut::<Inventory>(player);
inv.set_item_at(
packet.slot as SlotIndex,
ItemStack::new(item.ty, item.amount - count),
)
}
}

Expand Down