array-in-a-matrix/brainwine
1
0
Fork 0
mirror of https://github.com/array-in-a-matrix/brainwine.git synced 2025-04-02 11:11:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resources are now added to/removed from inventory

Browse source
This commit is contained in:
kuroppoi 2021-04-24 20:36:49 +02:00
parent 8e05ed062e
commit 779462a8fa
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gameserver/src/main/java/brainwine/gameserver/item/Item.java
View file

@ -44,6 +44,9 @@ public class Item {
@JsonProperty("invulnerable")
private boolean invulnerable;
@JsonProperty("inventory")
private String inventoryItem;
@JsonProperty("use")
private Map<ItemUseType, Object> useConfigs = new HashMap<>();
@ -130,6 +133,14 @@ public class Item {
return invulnerable || !isPlacable();
}
public Item getInventoryItem() {
if(inventoryItem == null) {
return this;
}
return ItemRegistry.getItem(inventoryItem);
}
public boolean hasUse(ItemUseType... types) {
for(ItemUseType type : types) {
if(useConfigs.containsKey(type)) {

5
gameserver/src/main/java/brainwine/gameserver/server/requests/BlockMineRequest.java
View file

@ -50,6 +50,11 @@ public class BlockMineRequest extends PlayerRequest {
}
zone.updateBlock(x, y, layer, 0, 0, player);
Item inventoryItem = item.getInventoryItem();
if(!inventoryItem.isAir()) {
player.getInventory().addItem(inventoryItem);
}
}
private void fail(Player player, String reason) {

1
gameserver/src/main/java/brainwine/gameserver/server/requests/BlockPlaceRequest.java
View file

@ -67,6 +67,7 @@ public class BlockPlaceRequest extends PlayerRequest {
}
zone.updateBlock(x, y, layer, item, mod, player);
player.getInventory().removeItem(item);
}
private void fail(Player player, String reason) {