CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #376 from CivMC/interact-fix

Browse Source 
Allow interacting with chests and trapdoors if doing so would not actually open them
This commit is contained in:
okx-code
2024-03-21 00:28:55 +00:00
committed by GitHub
parent 1ca93562a9 99420626c5
commit 23e486561b
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/listener/BlockListener.java
View File

@@ -239,21 +239,35 @@ public class BlockListener implements Listener {
if (rein == null) {
return;
}
Player player = e.getPlayer();
// Logic copied from ServerPlayerGameMode#useItemOn
// This will let the event happen if the player is not going to actually open/interact with the block
boolean flag = player.getInventory().getItemInMainHand().getType() != Material.AIR || player.getInventory().getItemInOffHand().getType() != Material.AIR;
if (player.isSneaking() && flag) {
return;
}
// Iron trapdoors and doors cannot be opened by right clicking on them
if (e.getClickedBlock().getType() == Material.IRON_TRAPDOOR || e.getClickedBlock().getType() == Material.IRON_DOOR) {
return;
}
if (e.getClickedBlock().getState() instanceof Container) {
if (!rein.hasPermission(e.getPlayer(), CitadelPermissionHandler.getChests())) {
if (!rein.hasPermission(player, CitadelPermissionHandler.getChests())) {
e.setCancelled(true);
String msg = String.format("%s is locked with %s%s", e.getClickedBlock().getType().name(),
ChatColor.AQUA, rein.getType().getName());
CitadelUtility.sendAndLog(e.getPlayer(), ChatColor.RED, msg, e.getClickedBlock().getLocation());
CitadelUtility.sendAndLog(player, ChatColor.RED, msg, e.getClickedBlock().getLocation());
}
return;
}
if (e.getClickedBlock().getBlockData() instanceof Openable) {
if (!rein.hasPermission(e.getPlayer(), CitadelPermissionHandler.getDoors())) {
if (!rein.hasPermission(player, CitadelPermissionHandler.getDoors())) {
e.setCancelled(true);
String msg = String.format("%s is locked with %s%s", e.getClickedBlock().getType().name(),
ChatColor.AQUA, rein.getType().getName());
CitadelUtility.sendAndLog(e.getPlayer(), ChatColor.RED, msg, e.getClickedBlock().getLocation());
CitadelUtility.sendAndLog(player, ChatColor.RED, msg, e.getClickedBlock().getLocation());
}
}
}