Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-31 21:48:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FlyingPikachu/Quests.git

Browse Source
This commit is contained in:
Valar_Dev 2015-01-06 10:30:00 -06:00
commit 9194215a11
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/me/blackvein/quests/util/ItemUtil.java
View File

@ -74,7 +74,7 @@ public class ItemUtil implements ColorUtil {
}
//Formats -> id-id:amount-amount:data-data:enchantment-enchantment level:name-name:lore-lore:
//Formats -> name-name:amount-amount:data-data:enchantment-enchantment level:displayname-displayname:lore-lore:
//
public static ItemStack readItemStack(String data) {
@ -99,7 +99,7 @@ public class ItemUtil implements ColorUtil {
String[] enchs = arg.substring(12).split(" ");
Enchantment e = Quests.getEnchantment(enchs[0]);
meta.addEnchant(e, Integer.parseInt(enchs[1]), true);
} else if (arg.startsWith("name-")) {
} else if (arg.startsWith("displayname-")) {
meta.setDisplayName(arg.substring(5));
} else if (arg.startsWith("lore-")) {
lore.add(arg.substring(5));
@ -141,7 +141,7 @@ public class ItemUtil implements ColorUtil {
ItemMeta meta = is.getItemMeta();
if (meta.hasDisplayName()) {
serial += ":name-" + meta.getDisplayName();
serial += ":displayname-" + meta.getDisplayName();
}
if (meta.hasLore()) {
for (String s : meta.getLore()) {

8
src/main/resources/quests.yml
View File

@ -6,15 +6,15 @@ quests:
redo-delay: 1800000
requirements:
items:
- id-270:amount-1
- name-wooden_pickaxe:amount-1
remove-items:
- false
fail-requirement-message: '<red>You must have a <purple>Wooden Pickaxe<red> first.'
stages:
ordered:
1:
break-block-ids:
- 1
break-block-names:
- dirt
break-block-amounts:
- 10
rewards:
@ -52,7 +52,7 @@ quests:
- 1
rewards:
items:
- id-276:amount-1
- name-diamond_sword:amount-1
exp: 100
quest-points: 1