Skip to content

Add option to enable/disable zombie villager converting to visitor #10496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cylian914 wants to merge 6 commits into
base: version/main
Choose a base branch
from
+5 −1
Open

Add option to enable/disable zombie villager converting to visitor #10496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
258f68b
Add option to enable/disable zombie villager converting to visitor
cylian914 Nov 16, 2024
7d87b89
add language
cylian914 Nov 16, 2024
a29fca8
fix upercase
cylian914 Nov 16, 2024
4eece6a
Merge branch 'ldtteam:version/main' into version/main
cylian914 Dec 1, 2024
efc2efa
Merge branch 'version/main' into version/main
cylian914 Dec 24, 2024
42b8471
Merge branch 'version/main' into version/main
cylian914 Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/minecolonies/api/configuration/ServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class ServerConfiguration extends AbstractConfiguration
public final ForgeConfigSpec.IntValue maxTreeSize;
public final ForgeConfigSpec.BooleanValue noSupplyPlacementRestrictions;
public final ForgeConfigSpec.BooleanValue skyRaiders;
public final ForgeConfigSpec.BooleanValue convertZombieVillagerToVisitor;

/* --------------------------------------------------------------------------- *
* ------------------- ######## Research settings ######## ------------------- *
Expand Down Expand Up @@ -141,6 +142,7 @@ protected ServerConfiguration(final ForgeConfigSpec.Builder builder)
maxTreeSize = defineInteger(builder, "maxtreesize", 400, 1, 1000);
noSupplyPlacementRestrictions = defineBoolean(builder, "nosupplyplacementrestrictions", false);
skyRaiders = defineBoolean(builder, "skyraiders", false);
convertZombieVillagerToVisitor = defineBoolean(builder, "convertzombievillagertovisitor", true);

swapToCategory(builder, "research");
researchCreativeCompletion = defineBoolean(builder, "researchcreativecompletion", true);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/minecolonies/core/event/EventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ public static void onCropTrample(BlockEvent.FarmlandTrampleEvent event)
public static void onEntityConverted(@NotNull final LivingConversionEvent.Pre event)
{
LivingEntity entity = event.getEntity();
if (entity instanceof ZombieVillager && event.getOutcome() == EntityType.VILLAGER)
if (MineColonies.getConfig().getServer().convertZombieVillagerToVisitor.get() && entity instanceof ZombieVillager && event.getOutcome() == EntityType.VILLAGER)
{
final Level world = entity.getCommandSenderWorld();
final IColony colony = IColonyManager.getInstance().getIColony(world, entity.blockPosition());
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/minecolonies/lang/manual_en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
"minecolonies.config.nosupplyplacementrestrictions.comment": "Disables supply camp placing restrictions, intended for skyworlds and similar",
"minecolonies.config.skyraiders": "Enable raiders to spawn in the sky",
"minecolonies.config.skyraiders.comment": "Raiders will spawn in the sky if this is enabled",
"minecolonies.config.convertzombievillagertovisitor": "Enable zombie villager convert to visitor",
"minecolonies.config.convertzombievillagertovisitor.comment": "Zombie villager when converted will be transformed into visitor if this is enabled",
"minecolonies.config.disableemptycolonies": "Disable Empty Colonies",
"minecolonies.config.disableemptycolonies.comment": "Will stop empty colonies from being generated in the world - Needs world Reload",
"minecolonies.config.averageemptycolonydistance": "Average Empty Colony Distance - Needs Complete Restart",
Expand Down