Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

configurable mob size attribute (#1538)

Browse Source
This commit is contained in:
granny
2024-06-21 04:11:09 -07:00
committed by GitHub
parent c0f5e78dc2
commit b82f6939fe
234 changed files with 2140 additions and 1855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0138-Add-config-for-villager-trading.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add config for villager trading
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 7d1dca008bd506a4cbd1b25624f03a1c378e80a0..1e100de8d30777e83907c523ffc1a3a54c670205 100644
index 5ae9fd76b7c654887171a68e182b783a5192b9e2..77fc9ca8d4a72cdb7db51297a13808f46e497126 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -373,6 +373,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -374,6 +374,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
}
if (level().purpurConfig.villagerRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur
@@ -32,10 +32,10 @@ index 05c63eb6cf8a7067105c58d244c7cc27d6bf1125..7c2d5d28f8c2aba2cd8255a4aef22247
return InteractionResult.sidedSuccess(this.level().isClientSide);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1c23f10f6644685c9fb25a12aa9ad81769e0070a..e8e741f2492a3326139295ee02d8b89c54c8f047 100644
index 58534a280f2700bb317b6d471af3f7992e9cf204..b359af74ec6dee1fdfe7dbcfeeafccf35c5d45c2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2142,6 +2142,7 @@ public class PurpurWorldConfig {
@@ -2256,6 +2256,7 @@ public class PurpurWorldConfig {
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
@@ -43,7 +43,7 @@ index 1c23f10f6644685c9fb25a12aa9ad81769e0070a..e8e741f2492a3326139295ee02d8b89c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2160,6 +2161,7 @@ public class PurpurWorldConfig {
@@ -2275,6 +2276,7 @@ public class PurpurWorldConfig {
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
@@ -51,7 +51,7 @@ index 1c23f10f6644685c9fb25a12aa9ad81769e0070a..e8e741f2492a3326139295ee02d8b89c
}
public boolean vindicatorRidable = false;
@@ -2189,6 +2191,7 @@ public class PurpurWorldConfig {
@@ -2307,6 +2309,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
@@ -59,7 +59,7 @@ index 1c23f10f6644685c9fb25a12aa9ad81769e0070a..e8e741f2492a3326139295ee02d8b89c
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2202,6 +2205,7 @@ public class PurpurWorldConfig {
@@ -2321,6 +2324,7 @@ public class PurpurWorldConfig {
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);