Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-31 12:56:28 +00:00
Code Issues Releases Activity

Merge branch 'master' into dev/new-command

Browse Source 
# Conflicts:
#	leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
This commit is contained in:
MC_XiaoHei
2025-08-31 14:41:58 +08:00
parent f230b76ea8 ff184c1da6
commit 1241342345
87 changed files with 38 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
View File

@@ -304,9 +304,6 @@ public final class LeavesConfig {
@GlobalConfig("shears-in-dispenser-can-zero-amount")
public boolean shearsInDispenserCanZeroAmount = false;
@GlobalConfig("armor-stand-cant-kill-by-mob-projectile")
public boolean armorStandCantKillByMobProjectile = false;
@SuppressWarnings("unused")
@GlobalConfig(value = "villager-infinite-discounts", validator = VillagerInfiniteDiscountsValidator.class)
private boolean villagerInfiniteDiscounts = false;
@@ -679,9 +676,6 @@ public final class LeavesConfig {
@GlobalConfig("no-tnt-place-update")
public boolean noTNTPlaceUpdate = false;
@GlobalConfig("raider-die-skip-self-raid-check")
public boolean skipSelfRaidCheck = false;
@GlobalConfig("container-passthrough")
public boolean containerPassthrough = false;
@@ -1292,5 +1286,8 @@ public final class LeavesConfig {
public enum CollisionBehavior {
VANILLA, BLOCK_SHAPE_VANILLA, PAPER
}
@GlobalConfig("vanilla-end-void-rings")
public boolean vanillaEndVoidRings = false;
}
}