Add a config option if villagers are meltable into emeralds. #1400

If disabled they'll give blood. And horses will do that too now if the option for glue is disabled.
This commit is contained in:
Bernhard Bonigl committed 2015-02-14 23:59:21 +01:00
1 parent 3473d7a469
commit 4611e2b2ba
2 files changed
+5 -3

No files matched your search

@@ -333,7 +333,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
{
if (moltenMetal.size() >= 1)
{
if (o instanceof EntityVillager)
if (o instanceof EntityVillager && PHConstruct.meltableVillagers)
{
EntityVillager villager = (EntityVillager) o;
if (villager.attackEntityFrom(new SmelteryDamageSource(), 5))
@@ -367,10 +367,10 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
}
}
}
else if (o instanceof EntityHorse)
else if (o instanceof EntityHorse && PHConstruct.meltableHorses)
{
EntityHorse horse = (EntityHorse) o;
if (PHConstruct.meltableHorses && horse.attackEntityFrom(new SmelteryDamageSource(), 5))
if (horse.attackEntityFrom(new SmelteryDamageSource(), 5))
{
if (currentLiquid + 108 < maxLiquid)
{
@@ -189,6 +189,7 @@ public class PHConstruct
throwableSmeltery = config.get("Experimental", "Items can be thrown into smelteries", true).getBoolean(true);
newSmeltery = config.get("Experimental", "Use new adaptive Smeltery code", false, "Warning: Very buggy").getBoolean(false);
meltableHorses = config.get("Experimental", "Allow horses to be melted down for glue", true).getBoolean(true);
meltableVillagers = config.get("Experimental", "Allow villagers to be melted down for emeralds", true).getBoolean(true);
minimalTextures = config.get("Experimental", "Minimal Textures", false).getBoolean(false);
extraBlockUpdates = config.get("Experimental", "Send additional block updates when using AOE tools", true,"This fixes very fast tools sometimes resulting in ghost blocks, but causes a bit more network traffic. Should be fine in theory.").getBoolean(true);
@@ -362,6 +363,7 @@ public class PHConstruct
public static boolean throwableSmeltery;
public static boolean newSmeltery;
public static boolean meltableHorses;
public static boolean meltableVillagers;
public static boolean minimalTextures;
public static boolean extraBlockUpdates;