Recycling center fixes. Bedrock dropping fix.

master_event
sigonasr2 11 years ago
parent 310a0964a5
commit 663637467c
  1. 11
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
  2. 40
      BankEconomyMod/src/me/kaZep/Base/RecyclingCenterNode.java

@ -2326,14 +2326,15 @@ implements Listener
if (e.getEntity().getCustomName()!=null && e.getEntity().getCustomName().equals(ChatColor.GOLD+"Charge Zombie II")) { if (e.getEntity().getCustomName()!=null && e.getEntity().getCustomName().equals(ChatColor.GOLD+"Charge Zombie II")) {
//Destroy an area around itself. //Destroy an area around itself.
for (int k=-4;k<5;k++) { int size=((int)(Math.random()*5))+1;
for (int j=-4;j<5;j++) { for (int k=-size;k<size;k++) {
for (int m=-1;m<5;m++) { for (int j=-size;j<size;j++) {
if (Math.random()<=1.00-((j+4)*0.05d)) { for (int m=-1;m<size/2;m++) {
if (Math.random()<=1.00-((m+4)*0.05d)) {
Location checkloc = e.getEntity().getLocation().add(k,m,j); Location checkloc = e.getEntity().getLocation().add(k,m,j);
Block bl = Bukkit.getWorld("world").getBlockAt(checkloc); Block bl = Bukkit.getWorld("world").getBlockAt(checkloc);
if (bl.getType()!=Material.BEDROCK && bl.getType()!=Material.ENDER_PORTAL_FRAME && bl.getType()!=Material.ENDER_PORTAL && bl.getType()!=Material.MOB_SPAWNER || bl.getType()!=Material.COMMAND || bl.getType()!=Material.MOSSY_COBBLESTONE) { if (bl.getType()!=Material.BEDROCK && bl.getType()!=Material.ENDER_PORTAL_FRAME && bl.getType()!=Material.ENDER_PORTAL && bl.getType()!=Material.MOB_SPAWNER || bl.getType()!=Material.COMMAND || bl.getType()!=Material.MOSSY_COBBLESTONE) {
bl.breakNaturally(); bl.setType(Material.AIR);
} }
} }
} }

@ -15,6 +15,11 @@ public class RecyclingCenterNode {
public static double chanceincrease = 3.0; //The amount of chance that each item will increase the chest as it gets placed. Increase this for less items. public static double chanceincrease = 3.0; //The amount of chance that each item will increase the chest as it gets placed. Increase this for less items.
public static double chestdecrease = 0.05; //The amount of chance that each item will decrease the chest. Increase this for more items. public static double chestdecrease = 0.05; //The amount of chance that each item will decrease the chest. Increase this for more items.
//Store our items we can give out array along with our rare items we might potentially track.
public static int[] items = {1,3,4,5,6,12,13,14,15,17,18,20,22,23,24,25,27,28,39,31,32,33,35,37,38,39,40,41,42,44,45,46,47,48,49,50,53,54,57,58,61,65,66,67,69,70,72,76,77,78,80,81,82,84,85,86,87,88,89,91,96,98,101,102,103,106,107,108,109,111,112,113,114,116,121,122,123,126,128,130,131,133,134,135,136,138,139,143,145,146,147,148,151,152,154,155,156,157,158,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,2256,2257,2258,2259,2260,2261,2262,2263,2264,2265,2266,2267};
//Rare items can only be given out in quantities of 1. To prevent massive amounts of OP.
public static int[] rareitems = {173,263,256,257,258,265,267,306,307,308,309,417,266,283,284,285,286,314,315,316,317,322,418,57,264,276,277,278,279,310,311,312,313,419,14,15,16,21,73,56,129,41,46,57,116,122,133,130,146,151,264,266,276,277,278,279,293,310,311,312,313,368,381,406};
public static int[] unalloweditems = {127,7,11,9,19,32,34,59,141,142,405,26,31,51,63,64,68,71,78,90,117,118,119,127,137,140,144,383};
List<Location> locations; //List of all chest locations for this Node. List<Location> locations; //List of all chest locations for this Node.
int itemslot; //Stores the current item we are on in that chest. From 0-26. int itemslot; //Stores the current item we are on in that chest. From 0-26.
double chance; //The chance we will let an item in. This increases over time to prevent overpopulation. double chance; //The chance we will let an item in. This increases over time to prevent overpopulation.
@ -96,23 +101,28 @@ public class RecyclingCenterNode {
} }
} }
if (Math.random()*tempchance<1.0d) { if (Math.random()*tempchance<1.0d) {
//Deposit item. Set chance higher. boolean contains=false;
if (c.getBlockInventory().getItem(itemslot)!=null) { for (int k=0;k<unalloweditems.length;k++) {
c.getBlockInventory().remove(itemslot); if (itemslot==unalloweditems[k]) {
contains=true;
break;
}
} }
c.getBlockInventory().setItem(itemslot,item); if (!contains) { //Make sure this is not an invalid item.
itemslot=(itemslot+1)%27; //Deposit item. Set chance higher.
chance+=chanceincrease; if (c.getBlockInventory().getItem(itemslot)!=null) {
//Random item chance increases as we get more and more drops. c.getBlockInventory().remove(itemslot);
if (this.plugin.randomitemchance>8.0d) { }
this.plugin.randomitemchance-=1d; c.getBlockInventory().setItem(itemslot,item);
itemslot=(itemslot+1)%27;
chance+=chanceincrease;
//Random item chance increases as we get more and more drops.
if (this.plugin.randomitemchance>8.0d) {
this.plugin.randomitemchance-=1d;
}
} }
} else { } else {
if (Math.random()*this.plugin.randomitemchance<1.0d) { if (Math.random()*this.plugin.randomitemchance<1.0d) {
//Store our items we can give out array along with our rare items we might potentially track.
int[] items = {1,3,4,5,6,1,13,14,15,17,18,20,22,23,24,25,27,28,39,31,32,33,35,37,38,39,40,41,42,44,45,46,47,48,49,50,53,54,57,58,61,65,66,67,69,70,72,76,77,78,80,81,82,84,85,86,87,88,89,91,96,98,101,102,103,106,107,108,109,111,112,113,114,116,121,122,123,126,128,130,131,133,134,135,136,138,139,143,145,146,147,148,151,152,154,155,156,157,158,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,2256,2257,2258,2259,2260,2261,2262,2263,2264,2265,2266,2267};
//Rare items can only be given out in quantities of 1. To prevent massive amounts of OP.
int[] rareitems = {41,46,57,116,122,133,130,146,151,264,266,276,277,278,279,293,310,311,312,313,368,381,406};
int item1 = items[(int)(Math.random()*items.length)]; int item1 = items[(int)(Math.random()*items.length)];
ItemStack newitem = item; ItemStack newitem = item;
newitem.setTypeId(item1); newitem.setTypeId(item1);
@ -126,14 +136,14 @@ public class RecyclingCenterNode {
if (contains) { if (contains) {
//This is a rare item! We increase the random item chance a ton! Also only allow 1 to be in there. //This is a rare item! We increase the random item chance a ton! Also only allow 1 to be in there.
newitem.setAmount(1); newitem.setAmount(1);
this.plugin.randomitemchance+=400d; this.plugin.randomitemchance+=1600d;
} }
if (c.getBlockInventory().getItem(itemslot)!=null) { if (c.getBlockInventory().getItem(itemslot)!=null) {
c.getBlockInventory().remove(itemslot); c.getBlockInventory().remove(itemslot);
} }
c.getBlockInventory().setItem(itemslot,newitem); c.getBlockInventory().setItem(itemslot,newitem);
//Regardless if it's rare or not, increase the random item chance by 100. We won't do this again for awhile. //Regardless if it's rare or not, increase the random item chance by 100. We won't do this again for awhile.
this.plugin.randomitemchance+=100d; this.plugin.randomitemchance+=300d;
} else { } else {
if (this.plugin.randomitemchance>8.0d) { if (this.plugin.randomitemchance>8.0d) {
this.plugin.randomitemchance-=1d; this.plugin.randomitemchance-=1d;

Loading…
Cancel
Save