From 94dadb97fd0744b142c5f7c5688851e596c3f262 Mon Sep 17 00:00:00 2001 From: rockyhawk64 Date: Thu, 6 Oct 2022 18:21:20 +1100 Subject: [PATCH] 3.18.1.4 --- .../Maven__net_kyori_adventure_api_4_11_0.xml | 13 +++++++++++++ .../Maven__net_kyori_adventure_key_4_11_0.xml | 13 +++++++++++++ ..._net_kyori_adventure_text_minimessage_4_11_0.xml | 13 +++++++++++++ .../Maven__net_kyori_examination_api_1_3_0.xml | 13 +++++++++++++ .../Maven__net_kyori_examination_string_1_3_0.xml | 13 +++++++++++++ .../Maven__org_jetbrains_annotations_23_0_0.xml | 13 +++++++++++++ ...PSHOT1.xml => spigot_api_1_19_R0_1_SNAPSHOT.xml} | 4 ++-- CommandPanels.iml | 2 +- resource/plugin.yml | 2 +- .../playerinventoryhandler/InventorySaver.java | 10 ++++++++++ 10 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 .idea/libraries/Maven__net_kyori_adventure_api_4_11_0.xml create mode 100644 .idea/libraries/Maven__net_kyori_adventure_key_4_11_0.xml create mode 100644 .idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml create mode 100644 .idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml create mode 100644 .idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml create mode 100644 .idea/libraries/Maven__org_jetbrains_annotations_23_0_0.xml rename .idea/libraries/{spigot_api_1_19_R0_1_SNAPSHOT1.xml => spigot_api_1_19_R0_1_SNAPSHOT.xml} (57%) diff --git a/.idea/libraries/Maven__net_kyori_adventure_api_4_11_0.xml b/.idea/libraries/Maven__net_kyori_adventure_api_4_11_0.xml new file mode 100644 index 0000000..101abe7 --- /dev/null +++ b/.idea/libraries/Maven__net_kyori_adventure_api_4_11_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_key_4_11_0.xml b/.idea/libraries/Maven__net_kyori_adventure_key_4_11_0.xml new file mode 100644 index 0000000..ec1cb5c --- /dev/null +++ b/.idea/libraries/Maven__net_kyori_adventure_key_4_11_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml b/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml new file mode 100644 index 0000000..a59d7d8 --- /dev/null +++ b/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml b/.idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml new file mode 100644 index 0000000..5b4190e --- /dev/null +++ b/.idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml b/.idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml new file mode 100644 index 0000000..7b7a7c3 --- /dev/null +++ b/.idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_annotations_23_0_0.xml b/.idea/libraries/Maven__org_jetbrains_annotations_23_0_0.xml new file mode 100644 index 0000000..b271e07 --- /dev/null +++ b/.idea/libraries/Maven__org_jetbrains_annotations_23_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/spigot_api_1_19_R0_1_SNAPSHOT1.xml b/.idea/libraries/spigot_api_1_19_R0_1_SNAPSHOT.xml similarity index 57% rename from .idea/libraries/spigot_api_1_19_R0_1_SNAPSHOT1.xml rename to .idea/libraries/spigot_api_1_19_R0_1_SNAPSHOT.xml index c3d3148..a4b3f90 100644 --- a/.idea/libraries/spigot_api_1_19_R0_1_SNAPSHOT1.xml +++ b/.idea/libraries/spigot_api_1_19_R0_1_SNAPSHOT.xml @@ -1,7 +1,7 @@ - + - + diff --git a/CommandPanels.iml b/CommandPanels.iml index 7eee2ff..8f62570 100644 --- a/CommandPanels.iml +++ b/CommandPanels.iml @@ -25,7 +25,7 @@ - + diff --git a/resource/plugin.yml b/resource/plugin.yml index 32f0612..e89b416 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.18.1.3 +version: 3.18.1.4 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/playerinventoryhandler/InventorySaver.java b/src/me/rockyhawk/commandpanels/playerinventoryhandler/InventorySaver.java index c78e687..9178088 100644 --- a/src/me/rockyhawk/commandpanels/playerinventoryhandler/InventorySaver.java +++ b/src/me/rockyhawk/commandpanels/playerinventoryhandler/InventorySaver.java @@ -9,6 +9,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityPickupItemEvent; +import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.inventory.ItemStack; @@ -42,6 +43,15 @@ public class InventorySaver implements Listener { } } + @EventHandler + public void onDeath(PlayerDeathEvent e){ + //drop the players inventory if a panel is open in the inventory + if (plugin.openPanels.hasPanelOpen(e.getEntity().getName(), PanelPosition.Middle) || plugin.openPanels.hasPanelOpen(e.getEntity().getName(), PanelPosition.Bottom)) { + e.getDrops().clear(); + e.getDrops().addAll(Arrays.asList(plugin.inventorySaver.getNormalInventory(e.getEntity()))); + } + } + @EventHandler public void onPickup(EntityPickupItemEvent e){ if(e.getEntity() instanceof HumanEntity) {