sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Nether Warts not being properly recognized in Malleable Base

Browse Source 
Quest.
This commit is contained in:
sigonasr2 2016-06-30 05:51:21 -05:00
parent eb09d973b5
commit 1a56bb7951
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

2
src/plugin.yml
View File

@ -1,6 +1,6 @@
name: TwosideKeeper name: TwosideKeeper
main: sig.plugin.TwosideKeeper.TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper
version: 3.4.3-AntiAristo version: 3.4.3e2
commands: commands:
money: money:
description: Tells the player the amount of money they are holding. description: Tells the player the amount of money they are holding.

6
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -383,6 +383,12 @@ public class GenericFunctions {
case NETHER_WARTS:{ case NETHER_WARTS:{
return "Nether Wart"; return "Nether Wart";
} }
case NETHER_STALK:{
return "Nether Wart";
}
case GOLD_PLATE:{
return "Gold Pressure Plate";
}
case PISTON_BASE:{ case PISTON_BASE:{
return "Piston"; return "Piston";
} }

2
src/sig/plugin/TwosideKeeper/HelperStructures/MalleableBaseQuest.java
View File

@ -239,7 +239,7 @@ public class MalleableBaseQuest {
blacklisted_items.add(Material.MONSTER_EGGS); blacklisted_items.add(Material.MONSTER_EGGS);
blacklisted_items.add(Material.MYCEL); blacklisted_items.add(Material.MYCEL);
blacklisted_items.add(Material.NAME_TAG); blacklisted_items.add(Material.NAME_TAG);
blacklisted_items.add(Material.NETHER_STALK); blacklisted_items.add(Material.NETHER_WARTS);
blacklisted_items.add(Material.NETHER_STAR); blacklisted_items.add(Material.NETHER_STAR);
blacklisted_items.add(Material.POTATO); blacklisted_items.add(Material.POTATO);
blacklisted_items.add(Material.PISTON_EXTENSION); blacklisted_items.add(Material.PISTON_EXTENSION);

6
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -532,7 +532,11 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
DecimalFormat df = new DecimalFormat("0.00"); DecimalFormat df = new DecimalFormat("0.00");
if (cmd.getName().equalsIgnoreCase("fix")) { if (cmd.getName().equalsIgnoreCase("fix")) {
Player p = (Player)sender; Player p = (Player)sender;
sender.sendMessage("Localized Name is "+GenericFunctions.UserFriendlyMaterialName(p.getEquipment().getItemInMainHand().getType(),p.getEquipment().getItemInMainHand().getData().getData())); //sender.sendMessage("Localized Name is "+GenericFunctions.UserFriendlyMaterialName(p.getEquipment().getItemInMainHand().getType(),p.getEquipment().getItemInMainHand().getData().getData()));
if (Artifact.isMalleableBase(p.getEquipment().getItemInMainHand()) &&
MalleableBaseQuest.getTimeStarted(p.getEquipment().getItemInMainHand())<=147337849) {
p.getEquipment().setItemInMainHand(MalleableBaseQuest.setTimeStarted(p.getEquipment().getItemInMainHand(), getServerTickTime()));
}
return true; return true;
} else } else
if (cmd.getName().equalsIgnoreCase("money")) { if (cmd.getName().equalsIgnoreCase("money")) {