diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 0000000..e23e99b
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,90 @@
+
+
+ 4.0.0
+ me.NVus
+ NVus_Prison_Setup
+ NVus_PrisonSetup
+ 0.5.6
+ https://FNGnation.net
+
+
+
+ true
+ src/main/resources
+
+
+
+
+ maven-compiler-plugin
+ 3.8.1
+
+ ${java.version}
+ ${java.version}
+
+
+
+ maven-shade-plugin
+ 3.2.4
+
+
+ package
+
+ shade
+
+
+
+
+
+ com.github.wvengen
+ proguard-maven-plugin
+ 2.6.1
+
+
+ package
+
+ proguard
+
+
+
+
+ true
+ ${project.build.finalName}.jar
+ ${project.build.finalName}-proguard.jar
+ ${project.build.directory}
+ ${basedir}/proguard.conf
+
+ ${java.home}/jmods/java.base.jmod
+
+
+
+
+
+
+
+
+
+
+
+
+
+ papermc-repo
+ https://repo.papermc.io/repository/maven-public/
+
+
+ sonatype
+ https://oss.sonatype.org/content/groups/public/
+
+
+
+
+ io.papermc.paper
+ paper-api
+ 1.20.4-R0.1-SNAPSHOT
+ provided
+
+
+
+ 1.8
+ UTF-8
+
+
diff --git a/pom.xml b/pom.xml
index d1501fc..439a7cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
me.NVus
NVus_Prison_Setup
- 0.5.3
+ 0.5.9
jar
NVus_PrisonSetup
@@ -42,35 +42,35 @@
-
- com.github.wvengen
- proguard-maven-plugin
- 2.6.1
-
-
- package
-
- proguard
-
-
-
-
- true
- ${project.build.finalName}.jar
- ${project.build.finalName}-proguard.jar
- ${project.build.directory}
- ${basedir}/proguard.conf
-
- ${java.home}/jmods/java.base.jmod
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99,11 +99,11 @@
1.20.4-R0.1-SNAPSHOT
provided
-
- com.github.wvengen
- proguard-maven-plugin
- 2.6.1
-
+
+
+
+
+
diff --git a/src/main/java/me/nvus/nvus_prison_setup/Listeners/PlayerSpawn.java b/src/main/java/me/nvus/nvus_prison_setup/Listeners/PlayerSpawn.java
index 7fe876a..a9c072f 100644
--- a/src/main/java/me/nvus/nvus_prison_setup/Listeners/PlayerSpawn.java
+++ b/src/main/java/me/nvus/nvus_prison_setup/Listeners/PlayerSpawn.java
@@ -5,6 +5,7 @@ import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerJoinEvent;
@@ -14,7 +15,7 @@ import org.bukkit.inventory.meta.LeatherArmorMeta;
public class PlayerSpawn implements Listener {
- @EventHandler
+ @EventHandler(priority = EventPriority.LOWEST)
public void onPlayerJoin(PlayerJoinEvent event) {
Player joinedPlayer = event.getPlayer();
@@ -25,18 +26,19 @@ public class PlayerSpawn implements Listener {
}
}
- @EventHandler
+ @EventHandler(priority = EventPriority.LOWEST)
public void onPlayerDeath(PlayerDeathEvent event) {
Player deadPlayer = event.getEntity();
// Check if the player has the permission
if (deadPlayer.hasPermission("nvus.prisoner")) {
- // Destroy default prisoner armor
- destroyDefaultPrisonerArmor(deadPlayer);
+ // Remove prisoner armor from the list of dropped items
+ event.getDrops().removeIf(drop -> isPrisonerArmor(drop.getType()));
}
}
- @EventHandler
+
+ @EventHandler(priority = EventPriority.LOWEST)
public void onPlayerRespawn(PlayerRespawnEvent event) {
Player respawnedPlayer = event.getPlayer();
@@ -78,6 +80,40 @@ public class PlayerSpawn implements Listener {
player.sendMessage(ChatColor.translateAlternateColorCodes('&',"&6&lYou're a prisoner! &6You've been given the default prisoner armor!"));
}
+ // Destroy armor upon death etc.
+ private void destroyDefaultPrisonerArmor(Player player) {
+ player.getInventory().setHelmet(null);
+ player.getInventory().setChestplate(null);
+ player.getInventory().setLeggings(null);
+ player.getInventory().setBoots(null);
+
+ // Using this as a debug/check, will comment out later!
+ player.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6&lYour default prisoner armor has been destroyed!"));
+ }
+
+ private boolean isPrisonerArmor(Material material) {
+ return material == Material.LEATHER_HELMET ||
+ material == Material.LEATHER_CHESTPLATE ||
+ material == Material.LEATHER_LEGGINGS ||
+ material == Material.LEATHER_BOOTS;
+ }
+
+
+
+
+ /*
+ private void destroyDefaultPrisonerArmor(Player player) {
+ player.getInventory().setHelmet(null);
+ player.getInventory().setChestplate(null);
+ player.getInventory().setLeggings(null);
+ player.getInventory().setBoots(null);
+
+ // Using this as a debug/check, will comment out later!
+ player.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6&lYour default prisoner armor has been destroyed!"));
+ }
+ */
+
+ /*
// Destroy armor upon death etc.
private void destroyDefaultPrisonerArmor(Player player) {
// Loop through the armor slots and remove any armor pieces
@@ -90,4 +126,5 @@ public class PlayerSpawn implements Listener {
// Using this as a debug/check, will comment out later!
player.sendMessage(ChatColor.translateAlternateColorCodes('&', "&6&lYour default prisoner armor has been destroyed!"));
}
+ */
}