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

Hotfix for Leather being applied to bad item sets.

Browse Source
This commit is contained in:
sigonasr2 2016-09-04 23:09:15 -05:00
parent 417ab2d367
commit a89595fe14
3 changed files with 7 additions and 4 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/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -4035,7 +4035,7 @@ public class GenericFunctions {
} }
Location teleloc = target.getLocation().add(target.getLocation().getDirection().multiply(-1.0-mult)); Location teleloc = target.getLocation().add(target.getLocation().getDirection().multiply(-1.0-mult));
int i=0; int i=0;
while (teleloc.getBlock().getType().isSolid()) { while (teleloc.getBlock().getType().isSolid() || teleloc.getBlock().getType()==Material.BEDROCK) {
if (i==0) { if (i==0) {
teleloc=target.getLocation(); teleloc=target.getLocation();
} else } else

9
src/sig/plugin/TwosideKeeper/HelperStructures/Loot.java
View File

@ -508,7 +508,8 @@ public class Loot {
if (item.getType().toString().contains("SWORD")) { if (item.getType().toString().contains("SWORD")) {
} else } else
if (!GenericFunctions.isEquip(item)) { if (!GenericFunctions.isEquip(item) ||
item.getType().name().contains("LEATHER")) {
allowed = false; allowed = false;
} }
tierbonus = (custom)?tierbonus:modifyTierBonus(item,tierbonus); tierbonus = (custom)?tierbonus:modifyTierBonus(item,tierbonus);
@ -519,7 +520,8 @@ public class Loot {
item.setType(Material.SHIELD); item.setType(Material.SHIELD);
tierbonus/=(custom)?1:2; tierbonus/=(custom)?1:2;
} else } else
if (!GenericFunctions.isEquip(item)) { if (!GenericFunctions.isEquip(item) ||
item.getType().name().contains("LEATHER")) {
allowed = false; allowed = false;
} }
tierbonus = (custom)?tierbonus:modifyTierBonus(item,tierbonus); tierbonus = (custom)?tierbonus:modifyTierBonus(item,tierbonus);
@ -529,7 +531,8 @@ public class Loot {
if (item.getType().toString().contains("SWORD")) { if (item.getType().toString().contains("SWORD")) {
item.setType(Material.valueOf(item.getType().toString().replace("SWORD","")+"AXE")); item.setType(Material.valueOf(item.getType().toString().replace("SWORD","")+"AXE"));
} else } else
if (!GenericFunctions.isEquip(item)) { if (!GenericFunctions.isEquip(item) ||
item.getType().name().contains("LEATHER")) {
allowed = false; allowed = false;
} }
tierbonus = (custom)?tierbonus:modifyTierBonus(item,tierbonus); tierbonus = (custom)?tierbonus:modifyTierBonus(item,tierbonus);