EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #391 from Glitchfinder/master

Browse Source 
Fixing Data Value issues caused by the patch to deprecated ItemStack use.
This commit is contained in:
Glitchfinder
2012-12-29 13:02:07 -08:00
parent d35e56fd37 aa70c82824
commit 17169903b4
8 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/config/TreasuresConfig.java
View File

@ -126,8 +126,7 @@ public class TreasuresConfig extends ConfigLoader{
* Drops From & Max Level
*/
ItemStack item = new ItemStack(id, amount, (short) 0);
item.setData(new MaterialData(id, (byte) data));
ItemStack item = (new MaterialData(id, (byte) data)).toItemStack(amount);
if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {

12
src/main/java/com/gmail/nossr50/config/mods/CustomBlocksConfig.java
View File

@ -79,8 +79,7 @@ public class CustomBlocksConfig extends ConfigLoader {
}
if (skillType.equals("Ability_Blocks")) {
blockItem = new ItemStack(id, 1, (short) 0);
blockItem.setData(new MaterialData(id, data));
blockItem = (new MaterialData(id, data)).toItemStack(1);
blockList.add(blockItem);
continue;
@ -92,17 +91,14 @@ public class CustomBlocksConfig extends ConfigLoader {
}
if (dropItem) {
itemDrop = new ItemStack(dropID, 1, (short) 0);
itemDrop.setData(new MaterialData(dropID, dropData));
itemDrop = (new MaterialData(dropID, dropData)).toItemStack(1);
}
else {
itemDrop = new ItemStack(id, 1, (short) 0);
itemDrop.setData(new MaterialData(id, data));
itemDrop = (new MaterialData(id, data)).toItemStack(1);
}
block = new CustomBlock(minimumDropAmount, maxiumDropAmount, itemDrop, tier, xp, data, id);
blockItem = new ItemStack(id, 1, (short) 0);
blockItem.setData(new MaterialData(id, data));
blockItem = (new MaterialData(id, data)).toItemStack(1);
if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
customOres.add(blockItem);