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

make sniffer ridable

Browse Source
This commit is contained in:
granny
2023-03-18 21:29:23 -07:00
parent ab3bcc95b4
commit ea899cadeb
40 changed files with 264 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
patches/server/0104-Make-entity-breeding-times-configurable.patch
View File

@@ -477,23 +477,21 @@ index e9f1d53599168c4c4b44a14b445143025c4be83a..df438bc84c5b90f2fc66965f926dc2ef
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index d79c55668c2077869e08a77a03aeffefefafd788..f15e7a9e37339afa733bd319b192f2a8dc2a7b56 100644
index 47a9e7a036e647c05d8abebdda4cab0d69aac997..28c20f7f79fed655d4a746e8ef3d5d4d15118e04 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -81,6 +81,13 @@ public class Sniffer extends Animal {
this.setPathfindingMalus(BlockPathTypes.WATER, -2.0F);
@@ -96,6 +96,11 @@ public class Sniffer extends Animal {
public boolean isControllable() {
return level.purpurConfig.snifferControllable;
}
+ // Purpur start
+
+ @Override
+ public int getPurpurBreedTime() {
+ return this.level.purpurConfig.snifferBreedingTicks;
+ }
+ // Purpur end
+
// Purpur end
// CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
@Override
protected void defineSynchedData() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
index b512ac4b75e53c272a3c41fb5b66c84b6b0e9847..fbc2e3f0b73608a999619469cd701692cb1cb788 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
@@ -527,7 +525,7 @@ index 9cc42b4a1ea0d2315350e038034dfe7171668658..8e837ce3069ca05bcc93ea93f94c7934
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cdddd59400 100644
index 823130a1a6505bf900a455858ba9224e5a242a64..7077abe83b9c1cd6cc81c11740947f465049b1c5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -510,10 +510,12 @@ public class PurpurWorldConfig {
@@ -856,19 +854,20 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
}
public boolean shulkerRidable = false;
@@ -1561,6 +1603,11 @@ public class PurpurWorldConfig {
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
@@ -1564,10 +1606,12 @@ public class PurpurWorldConfig {
public boolean snifferRidable = false;
public boolean snifferRidableInWater = false;
public boolean snifferControllable = true;
+ public int snifferBreedingTicks = 6000;
private void snifferSettings() {
snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
+ snifferBreedingTicks = getInt("mobs.sniffer.breeding-delay-ticks", chickenBreedingTicks);
}
+ public int snifferBreedingTicks = 6000;
+ private void snifferSettings() {
+ snifferBreedingTicks = getInt("mobs.sniffer.breeding-delay-ticks", chickenBreedingTicks);
+ }
+
public boolean squidRidable = false;
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
@@ -1617,6 +1664,7 @@ public class PurpurWorldConfig {
@@ -1626,6 +1670,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -876,7 +875,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1627,6 +1675,7 @@ public class PurpurWorldConfig {
@@ -1636,6 +1681,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -884,7 +883,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
}
public boolean tadpoleRidable = false;
@@ -1647,6 +1696,7 @@ public class PurpurWorldConfig {
@@ -1656,6 +1702,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D; // TODO: re-implement
public double traderLlamaMovementSpeedMin = 0.175D; // TODO: re-implement
public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
@@ -892,7 +891,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1664,6 +1714,7 @@ public class PurpurWorldConfig {
@@ -1673,6 +1720,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -900,7 +899,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
}
public boolean tropicalFishRidable = false;
@@ -1684,6 +1735,7 @@ public class PurpurWorldConfig {
@@ -1693,6 +1741,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = false;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -908,7 +907,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1694,6 +1746,7 @@ public class PurpurWorldConfig {
@@ -1703,6 +1752,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -916,7 +915,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
}
public boolean vexRidable = false;
@@ -1721,6 +1774,7 @@ public class PurpurWorldConfig {
@@ -1730,6 +1780,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -924,7 +923,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1734,6 +1788,7 @@ public class PurpurWorldConfig {
@@ -1743,6 +1794,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -932,7 +931,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
}
public boolean vindicatorRidable = false;
@@ -1845,6 +1900,7 @@ public class PurpurWorldConfig {
@@ -1854,6 +1906,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = false;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -940,7 +939,7 @@ index bd46b5fa3404a4a64fefe1165735c03d9c2ec0db..d7669999bcf294c71c4238ccbeade1cd
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1855,6 +1911,7 @@ public class PurpurWorldConfig {
@@ -1864,6 +1917,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);