Fix and enhance EffOpenInventory #7508
Conversation
Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com>
…ript into fix/open-inventory
Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
| It looks mostly fine I think. |
Co-authored-by: Moderocky <admin@moderocky.com>
| EventValues.registerEventValue(InventorySectionEvent.class, Player[].class, InventorySectionEvent::getPlayers); | ||
| Skript.registerSection(EffSecOpenInventory.class, | ||
| "(show|create|open) %inventory/inventorytype% (to|for) %players%", | ||
| "open [a[n]] " + OpenableInventorySyntax.construct() + " [view|window|inventory] (to|for) %players%", |
There was a problem hiding this comment.
This allows open target block's inventory inventory to me
There was a problem hiding this comment.
Existing syntax, let me know if you want it to break existing syntax.
There was a problem hiding this comment.
It was not existing. The prior pattern was (open|show) (...|%-inventory/inventorytype%) (to|for) %players%. That doesn't allow open target block's inventory inventory to me. Sorry for the delayed response, I lost track of this notification in github.
| } | ||
| | ||
| private @Nullable OpenableInventorySyntax syntax; | ||
| private @Nullable Expression<?> object; |
There was a problem hiding this comment.
| private @Nullable Expression<?> object; | |
| private @Nullable Expression<?> inventoryObject; |
needs a more descriptive name
| if (open && hasSection()) | ||
| trigger = loadCode(sectionNode, "open inventory", InventorySectionEvent.class); | ||
| | ||
| return true; |
There was a problem hiding this comment.
There's no check to disallow
close player's inventory: do something | if (open && hasSection()) | ||
| trigger = loadCode(sectionNode, "open inventory", InventorySectionEvent.class); |
There was a problem hiding this comment.
Doesn't load code if using open %inventory/inventorytype%
| EventValues.registerEventValue(InventorySectionEvent.class, Inventory.class, InventorySectionEvent::getInventory); | ||
| EventValues.registerEventValue(InventorySectionEvent.class, Player[].class, InventorySectionEvent::getPlayers); | ||
| Skript.registerSection(EffSecOpenInventory.class, | ||
| "(show|create|open) %inventory/inventorytype% (to|for) %players%", |
There was a problem hiding this comment.
open an anvil inventory uses pattern 0
open an anvil uses pattern 1
These should both follow the same code path.
| for (Player player : players) | ||
| player.openInventory(inventory); | ||
| | ||
| } else { |
There was a problem hiding this comment.
The section trigger is never run in this path. This is the only path where the section trigger even exists.
| return super.walk(event, false); | ||
| | ||
| Player[] players = this.players.getArray(event); | ||
| if (players.length > 0 && trigger != null) { |
There was a problem hiding this comment.
Due to earlier errors, the trigger will always be null since loadCode was never called.
| @Override | ||
| public String toString(@Nullable Event event, boolean debug) { | ||
| if (object != null) | ||
| return "show " + object.toString(event, debug) + " to " + players.toString(event, debug); |
sovdeeth added feature Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
skriptlang-automation bot added the needs reviews 
| Inactivity |
skriptlang-automation bot removed the needs reviews 3 participants
Continuation #5531
See split commit Modify EffOpenInventory for easy reviewing to allow for easier reviewing of what was changed in EffOpenInventory before rename to EffSecOpenInventory.