From de597391dcf64e31e34913d2aeabb7ba7dbe31de Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Wed, 21 Apr 2021 11:03:14 +0200
Subject: [PATCH] Fix keep-inventory flag & adjust disallowed-blocks
 translation

---
 .../com/plotsquared/bukkit/listener/PlayerEventListener.java    | 1 +
 Core/src/main/resources/lang/messages_en.json                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
index bdcec6f11..b4dd2fd3b 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
@@ -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);
             }
         }
diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json
index ce591a20a..4b5b70da8 100644
--- a/Core/src/main/resources/lang/messages_en.json
+++ b/Core/src/main/resources/lang/messages_en.json
@@ -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>",