Allow players to set their hats by clicking on their helmet slot #960
Conversation
| @@ -621,6 +623,14 @@ public void onInventoryClickEvent(final InventoryClickEvent event) { | |||
| if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify") || invOwner.isAuthorized("essentials.invsee.preventmodify") || !invOwner.getBase().isOnline())) { | |||
| event.setCancelled(true); | |||
| refreshPlayer = user.getBase(); | |||
| } else if (ess.getSettings().isDirectHatAllowed() && ess.getUser(event.getWhoClicked()).isAuthorized("essentials.hat") && event.getSlot() == 38 && event.getClick() == ClickType.LEFT) { | |||
There was a problem hiding this comment.
I'd front load it with minimal-effort checks like the slot int and click type, ending in the isAuthorized call.
| @@ -621,6 +623,14 @@ public void onInventoryClickEvent(final InventoryClickEvent event) { | |||
| if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify") || invOwner.isAuthorized("essentials.invsee.preventmodify") || !invOwner.getBase().isOnline())) { | |||
| event.setCancelled(true); | |||
| refreshPlayer = user.getBase(); | |||
| } else if (ess.getSettings().isDirectHatAllowed() && ess.getUser(event.getWhoClicked()).isAuthorized("essentials.hat") && event.getSlot() == 38 && event.getClick() == ClickType.LEFT) { | |||
| if (event.getCursor().getType() != Material.AIR && event.getCursor().getType().getMaxDurability() == 0) { | |||
There was a problem hiding this comment.
I didn't get around to merging them. I'll restructure the if statements now.
|
Naming concern: Direct... hat? What does that even mean. |
|
"Direct" as in "directly" setting a hat by clicking on the inventory slot (as opposed to "indirectly" setting a hat by holding it in the primary hand and doing '/hat'). |
|
It feels confusing, because to me it implies that without this setting you are unable to click a helmet, and click it on your head to wear it. |
|
@mbax That's a fair point, but at the same time, the permission |
|
@SupaHam Could you review this by any chance? (If needed, I believe you automatically have push access to the PR branch.) |
|
@md678685 You can place items in the head slot with right clicking as well I believe. |
| inv.setHelmet(event.getCursor()); | ||
| event.setCursor(head); | ||
| } | ||
| } else if (ess.getSettings().isDirectHatAllowed() && event.getClick() == ClickType.LEFT && event.getSlot() == 38 && event.getCursor().getType() != Material.AIR && event.getCursor().getType().getMaxDurability() == 0 && ess.getUser(event.getWhoClicked()).isAuthorized("essentials.hat")) { |
There was a problem hiding this comment.
@SupaHam Does right-clicking send a left click event? There is a check here - ... && event.getClick() == ClickType.LEFT && ...
edit: ancient review I started ages ago and never submitted
There was a problem hiding this comment.
Right click will be of type ClickType#RIGHT.
There was a problem hiding this comment.
There's more logic to consider because depending on what exists in the slot or on cursor, different amounts of the stack would be placed.
Allow players to set their hats by clicking on their helmet slot; resolves #956
I'll clean up the extra imports in a couple of hours.