Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-01 06:33:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #233 from mikeprimm/master

Browse Source 
Fix reported trap in Armor calculation when player has incomplete set of armor
This commit is contained in:
mikeprimm 2011-06-23 06:13:32 -07:00
commit 654769af1e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/dynmap/Armor.java
View File

@ -2,6 +2,7 @@ package org.dynmap;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.Material;
public class Armor { public class Armor {
/** /**
@ -17,7 +18,12 @@ public class Armor {
double baseArmorPoints = 0; double baseArmorPoints = 0;
ItemStack inventory[] = player.getInventory().getArmorContents(); ItemStack inventory[] = player.getInventory().getArmorContents();
for(int i=0;i<inventory.length;i++) { for(int i=0;i<inventory.length;i++) {
final short maxDurability = inventory[i].getType().getMaxDurability(); if(inventory[i] == null)
continue;
Material m = inventory[i].getType();
if(m == null)
continue;
final short maxDurability = m.getMaxDurability();
if(maxDurability < 0) if(maxDurability < 0)
continue; continue;
final short durability = inventory[i].getDurability(); final short durability = inventory[i].getDurability();