Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix keep-inventory flag & adjust disallowed-blocks translation

This commit is contained in:
NotMyFault 2021-04-21 11:03:14 +02:00
parent 59599261ff
commit de597391dc
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
View File

@ -1676,6 +1676,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (plot.getFlag(KeepInventoryFlag.class)) {
if (plot.getFlag(KeepInventoryFlag.class)) {
plot.debug(event.getEntity().getName() + " kept their inventory because of keep-inventory = true");
event.getDrops().clear();
event.setKeepInventory(true);
}
}

2
Core/src/main/resources/lang/messages_en.json
View File

@ -197,7 +197,7 @@
"commandconfig.command_syntax_extended": "<prefix><gold>Usage: </gold><gray><value1> <value2></gray>",
"commandconfig.flag_tutorial_usage": "<prefix><gold>Have an admin set the flag: </gold><gray><flag></gray>",
"invalid.component_illegal_block": "<prefix><red>You are not allowed to generate a component containing the block <gray><value></gray></red>",
"invalid.not_valid_block": "<prefix><red>That's not a valid block: </red><gray><value></gray>",
"invalid.not_valid_block": "<prefix><red><value></red>",
"invalid.not_allowed_block": "<prefix><red>That block is not allowed: <gray><value></gray></red>",
"invalid.not_valid_number": "<prefix><red>That's not a valid number within the range: </red><gray><value></gray>",
"invalid.not_valid_plot_id": "<prefix><red>That's not a valid plot ID.</red>",