Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-03-02 10:11:02 +01:00
Code Issues Projects Releases Wiki Activity

Removed endermen.

Browse Source
This commit is contained in:
Brianna 2019-06-06 01:12:09 -04:00
parent 917a01d356
commit b5f5c4451e
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/songoda/ultimatestacker/entity/Check.java
View File

@ -11,7 +11,6 @@ public enum Check {
SKELETON_TYPE(true),
ZOMBIE_BABY(true),
SLIME_SIZE(true),
ENDERMAN_CARRY_BLOCK(true),
PIG_SADDLE(true),
SHEEP_SHEERED(true),
SHEEP_COLOR(true),

10
src/main/java/com/songoda/ultimatestacker/utils/Methods.java
View File

@ -82,7 +82,7 @@ public class Methods {
if (Setting.KILL_WHOLE_STACK_ON_DEATH.getBoolean() && stack.getAmount() != 1) {
handleWholeStackDeath(killed, stack, items, droppedExp);
} else if(stack.getAmount() != 1) {
List<String> reasons = Setting.SPECIAL_DEATH_CAUSE.getStringList();
List<String> reasons = Setting.INSTANT_KILL.getStringList();
EntityDamageEvent lastDamageCause = killed.getLastDamageCause();
if(lastDamageCause != null) {
@ -381,14 +381,6 @@ public class Methods {
entityList.removeIf(entity -> ((Zombie) entity).isBaby() != zombie.isBaby());
break;
}
case ENDERMAN_CARRY_BLOCK: {
if (!(initalEntity instanceof Enderman)) break;
if (!UltimateStacker.getInstance().isServerVersionAtLeast(ServerVersion.V1_13))
entityList.removeIf(entity -> ((Enderman) entity).getCarriedBlock() == null);
else
entityList.removeIf(entity -> ((Enderman) entity).getCarriedMaterial().getItemType() == null);
break;
}
case WOLF_COLLAR_COLOR: {
if (!(initalEntity instanceof Wolf)) break;
Wolf wolf = (Wolf) initalEntity;

10
src/main/java/com/songoda/ultimatestacker/utils/settings/Setting.java
View File

@ -23,7 +23,7 @@ public enum Setting {
"The speed in which a new stacks will be created.",
"It is advised to keep this number low."),
DISABLED_WORLDS("Main.DISABLED Worlds", Arrays.asList("World1", "World2", "World3"),
DISABLED_WORLDS("Main.Disabled Worlds", Arrays.asList("World1", "World2", "World3"),
"Worlds that stacking doesn't happen in."),
MAX_STACK_ENTITIES("Entity.Max Stack Size", 15,
@ -39,7 +39,7 @@ public enum Setting {
"Should killing a stack of entities kill the whole stack or",
"just one out of the stack?"),
SPECIAL_DEATH_CAUSE("Entity.Special Death Cause", Arrays.asList("FALL", "DROWNING", "LAVA", "VOID"),
INSTANT_KILL("Entity.Instant Kill", Arrays.asList("FALL", "DROWNING", "LAVA", "VOID"),
"Events that will trigger an entire stack to be killed.",
"It should be noted that this is useless if the above setting is true.",
"Any of the following can be added to the list:",
@ -58,9 +58,9 @@ public enum Setting {
"The acceptable check options are:",
"NERFED, AGE, TICK_AGE, PHANTOM_SIZE",
"CAN_BREED, IS_TAMED, ANIMAL_OWNER, SKELETON_TYPE",
"ZOMBIE_BABY, SLIME_SIZE, ENDERMAN_CARRY_BLOCK, PIG_SADDLE",
"SHEEP_SHEERED, SHEEP_COLOR, WOLF_COLLAR_COLOR, OCELOT_TYPE",
"HORSE_COLOR, HORSE_STYLE, HORSE_CARRYING_CHEST, HORSE_HAS_ARMOR",
"ZOMBIE_BABY, SLIME_SIZE, PIG_SADDLE, SHEEP_SHEERED",
"SHEEP_COLOR, WOLF_COLLAR_COLOR, OCELOT_TYPE, HORSE_COLOR",
"HORSE_STYLE, HORSE_CARRYING_CHEST, HORSE_HAS_ARMOR",
"HORSE_HAS_SADDLE, HORSE_JUMP, RABBIT_TYPE, VILLAGER_PROFESSION",
"LLAMA_COLOR, LLAMA_STRENGTH, PARROT_TYPE, PUFFERFISH_STATE",
"TROPICALFISH_PATTERN, TROPICALFISH_BODY_COLOR, TROPICALFISH_PATTERN_COLOR"),