Chronika/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added MaterialData from BlockState

Browse Source
This commit is contained in:
Dinnerbone
2011-01-15 00:08:49 +00:00
parent 599a6574c7
commit ce1247aa2e
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/bukkit/ItemStack.java
View File

@@ -40,14 +40,7 @@ public class ItemStack {
this.type = type;
this.amount = amount;
this.damage = damage;
Material mat = Material.getMaterial(type);
if (mat == null) {
this.data = new MaterialData(type, data);
} else {
this.data = mat.getNewData(data);
}
createData(data);
}
public ItemStack(final Material type, final int amount, final byte damage, final byte data) {
@@ -92,14 +85,7 @@ public class ItemStack {
*/
public void setTypeID(int type) {
this.type = type;
Material mat = Material.getMaterial(type);
if (mat == null) {
data = new MaterialData(type, (byte)0);
} else {
data = mat.getNewData((byte)0);
}
createData((byte)0);
}
/**
@@ -185,6 +171,15 @@ public class ItemStack {
return -1;
}
private void createData(final byte data) {
Material mat = Material.getMaterial(type);
if (mat == null) {
this.data = new MaterialData(type, data);
} else {
this.data = mat.getNewData(data);
}
}
@Override
public String toString() {
return "ItemStack{"+getType().name()+" x "+getAmount()+"}";