Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Big dripleaf tilt delay

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-16 23:01:23 -05:00
parent d43b5ff644
commit 27211924b2
155 changed files with 568 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0174-Add-config-for-villager-trading.patch
View File

@@ -5,7 +5,7 @@ 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 30961a60449a20c4168c4b0a593402df3066379d..4df6a5cf1a2fb00e77814307b52f45a1dae49a58 100644
index beaa009603b68dc1f7d541d594af22cbe9bb0e9d..b649ef2c96beeb6c2d98f54375bbeb1159c7f4ba 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -375,7 +375,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f204e37af958cf2319269290c4bafeae6631d677..7fabd86e2013e58ede9b1100ea7a1c5dee413e1b 100644
index faed98c18ea0014ffb3c84ef4b6983683ee9b92c..a6bc8130656d34d4a5134ef9bb7cb72f470573a8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1838,6 +1838,7 @@ public class PurpurWorldConfig {
@@ -1839,6 +1839,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index f204e37af958cf2319269290c4bafeae6631d677..7fabd86e2013e58ede9b1100ea7a1c5d
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1865,6 +1866,7 @@ public class PurpurWorldConfig {
@@ -1866,6 +1867,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -50,7 +50,7 @@ index f204e37af958cf2319269290c4bafeae6631d677..7fabd86e2013e58ede9b1100ea7a1c5d
}
public boolean vindicatorRidable = false;
@@ -1888,6 +1890,7 @@ public class PurpurWorldConfig {
@@ -1889,6 +1891,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index f204e37af958cf2319269290c4bafeae6631d677..7fabd86e2013e58ede9b1100ea7a1c5d
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1899,6 +1902,7 @@ public class PurpurWorldConfig {
@@ -1900,6 +1903,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);