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

Fixed Hardened Obscured item breaks.

Browse Source
This commit is contained in:
sigonasr2 2016-07-15 16:10:20 -05:00
parent f2ee0afa71
commit b2f23fc236
3 changed files with 605 additions and 597 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

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

@ -175,6 +175,8 @@ public class GenericFunctions {
m.setDisplayName(ChatColor.BLUE+"Hardened "+UserFriendlyMaterialName(item)); m.setDisplayName(ChatColor.BLUE+"Hardened "+UserFriendlyMaterialName(item));
} }
item.setItemMeta(m); item.setItemMeta(m);
item.setAmount(1);
item.setDurability((short)0);
return item; return item;
} }
} }
@ -241,10 +243,11 @@ public class GenericFunctions {
} }
} }
} }
if (break_count>5) {break_count=5;} if (break_count>6) {break_count=6;}
lore.set(break_line, ChatColor.GRAY+"Breaks Remaining: "+ChatColor.MAGIC+(break_count)); lore.set(break_line, ChatColor.GRAY+"Breaks Remaining: "+ChatColor.MAGIC+(break_count));
TwosideKeeper.log("Setting breaks remaining to "+(break_count),3); TwosideKeeper.log("Setting breaks remaining to "+(break_count),3);
m.setLore(lore); m.setLore(lore);
item.setItemMeta(m);
return break_count; return break_count;
} }
return 0; return 0;

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

@ -1694,8 +1694,11 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} }
} }
@EventHandler(priority=EventPriority.LOW,ignoreCancelled = true) @EventHandler(priority=EventPriority.LOW)
public void onPlayerInteract(PlayerInteractEvent ev) { public void onPlayerInteract(PlayerInteractEvent ev) {
if (ev.isCancelled() && ev.getAction() == Action.RIGHT_CLICK_BLOCK) {
return;
} else {
Block b = ev.getClickedBlock(); Block b = ev.getClickedBlock();
log("Interaction type: "+ev.getAction().toString(),5); log("Interaction type: "+ev.getAction().toString(),5);
@ -1925,6 +1928,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
ev.getPlayer().getInventory().getItemInMainHand().getItemMeta().getLore().size()==4 && ev.getPlayer().getInventory().getItemInMainHand().getItemMeta().getLore().size()==4 &&
ev.getPlayer().getInventory().getItemInMainHand().getItemMeta().getLore().get(3).contains(ChatColor.DARK_PURPLE+"ID#")) { ev.getPlayer().getInventory().getItemInMainHand().getItemMeta().getLore().get(3).contains(ChatColor.DARK_PURPLE+"ID#")) {
//This is an item cube. //This is an item cube.
log("In we are",2);
ev.setCancelled(true); ev.setCancelled(true);
int itemcube_id=Integer.parseInt(ev.getPlayer().getInventory().getItemInMainHand().getItemMeta().getLore().get(3).split("#")[1]); int itemcube_id=Integer.parseInt(ev.getPlayer().getInventory().getItemInMainHand().getItemMeta().getLore().get(3).split("#")[1]);
int size=0; int size=0;
@ -2312,6 +2316,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} }
} }
} }
}
@EventHandler(priority=EventPriority.LOW,ignoreCancelled = true) @EventHandler(priority=EventPriority.LOW,ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent ev) { public void onBlockPlace(BlockPlaceEvent ev) {