update placeblock mixin - add items back to plr
All checks were successful
/ Auto-Build-App (push) Successful in 2m2s
All checks were successful
/ Auto-Build-App (push) Successful in 2m2s
This commit is contained in:
parent
d20867ecbd
commit
0e8f3c5a74
1 changed files with 4 additions and 0 deletions
|
@ -5,6 +5,8 @@ import finalforeach.cosmicreach.accounts.Account;
|
||||||
import finalforeach.cosmicreach.blocks.BlockPosition;
|
import finalforeach.cosmicreach.blocks.BlockPosition;
|
||||||
import finalforeach.cosmicreach.blocks.BlockState;
|
import finalforeach.cosmicreach.blocks.BlockState;
|
||||||
import finalforeach.cosmicreach.blocks.BlockStateMissing;
|
import finalforeach.cosmicreach.blocks.BlockStateMissing;
|
||||||
|
import finalforeach.cosmicreach.items.ItemMergeStrategy;
|
||||||
|
import finalforeach.cosmicreach.items.ItemStack;
|
||||||
import finalforeach.cosmicreach.networking.NetworkIdentity;
|
import finalforeach.cosmicreach.networking.NetworkIdentity;
|
||||||
import finalforeach.cosmicreach.networking.NetworkSide;
|
import finalforeach.cosmicreach.networking.NetworkSide;
|
||||||
import finalforeach.cosmicreach.networking.packets.MessagePacket;
|
import finalforeach.cosmicreach.networking.packets.MessagePacket;
|
||||||
|
@ -41,6 +43,8 @@ public class BlockPlaceMixin {
|
||||||
Account account = ServerSingletons.getAccount(identity);
|
Account account = ServerSingletons.getAccount(identity);
|
||||||
if (!Permissions.has_user_special_perm(account.getUniqueId()) && !can_edit_block(blockPos,"place",account.getUniqueId())) {
|
if (!Permissions.has_user_special_perm(account.getUniqueId()) && !can_edit_block(blockPos,"place",account.getUniqueId())) {
|
||||||
ci.cancel();
|
ci.cancel();
|
||||||
|
if (!identity.getPlayer().gamemode.hasInfiniteItems())
|
||||||
|
identity.getPlayer().inventory.merge(new ItemStack(targetBlockState.getItem()), ItemMergeStrategy.ONLY_ONE_SLOT);
|
||||||
|
|
||||||
MessagePacket packet = new MessagePacket("[Server] " + (is_not_reloading ? "Sorry, but this area is under protection." : "Sorry but you can't do this action right now. [Config Reload In Progress]"));
|
MessagePacket packet = new MessagePacket("[Server] " + (is_not_reloading ? "Sorry, but this area is under protection." : "Sorry but you can't do this action right now. [Config Reload In Progress]"));
|
||||||
packet.playerUniqueId=account.getUniqueId();
|
packet.playerUniqueId=account.getUniqueId();
|
||||||
|
|
Loading…
Reference in a new issue