Merge pull request #181 from TownyAdvanced/feature/small-tweaks

Small changes
TownyAdvanced · Mar 5, 2021 · 0386e74 · 0386e74
2 parents e203303 + 19b4dcb
commit 0386e74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/gmail/goosius/siegewar/command/SiegeWarCommand.java b/src/main/java/com/gmail/goosius/siegewar/command/SiegeWarCommand.java
@@ -73,7 +73,7 @@ private void showSiegeWarHelp(CommandSender sender) {
 		sender.sendMessage(ChatTools.formatCommand("Eg", "/sw collect", "", Translation.of("nation_help_11")));
 		sender.sendMessage(ChatTools.formatCommand("Eg", "/sw nation", "paysoldiers [amount]", Translation.of("nation_help_12")));
 		sender.sendMessage(ChatTools.formatCommand("Eg", "/sw preference", "beacons [on/off]", ""));
-		sender.sendMessage(ChatTools.formatCommand("Eg", "/sw version", ""));
+		sender.sendMessage(ChatTools.formatCommand("Eg", "/sw version", "", ""));
 	}
 
 	private void showNationHelp(CommandSender sender) {

diff --git a/src/main/java/com/gmail/goosius/siegewar/playeractions/PlayerDeath.java b/src/main/java/com/gmail/goosius/siegewar/playeractions/PlayerDeath.java
@@ -181,9 +181,7 @@ public static void evaluateSiegePlayerDeath(Player deadPlayer, PlayerDeathEvent
 	private static void degradeInventory(PlayerDeathEvent playerDeathEvent) {
 		Damageable damageable;
 		double maxDurability;
-		int currentDurability;
-		int damageToInflict;
-		int newDurability;
+		int currentDurability, damageToInflict, newDurability, durabilityWarning;
 		Boolean closeToBreaking = false;
 		if (SiegeWarSettings.getWarSiegeDeathPenaltyDegradeInventoryEnabled()) {
 			for (ItemStack itemStack : playerDeathEvent.getEntity().getInventory().getContents()) {
@@ -194,11 +192,14 @@ private static void degradeInventory(PlayerDeathEvent playerDeathEvent) {
 					damageToInflict = (int)(maxDurability / 100 * SiegeWarSettings.getWarSiegeDeathPenaltyDegradeInventoryPercentage());
 					newDurability = currentDurability + damageToInflict;
 					if (newDurability >= maxDurability) {
-						damageable.setDamage(Math.max((int)maxDurability-10, currentDurability));
+						damageable.setDamage(Math.max((int)maxDurability-25, currentDurability));
 						closeToBreaking = true;
 					}
 					else {
 						damageable.setDamage(newDurability);
+						durabilityWarning = damageToInflict * 2 + currentDurability;
+						if (durabilityWarning >= maxDurability)
+							closeToBreaking = true;
 					}
 					itemStack.setItemMeta((ItemMeta)damageable);
 				}