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

Revert "flip some config defaults for vanilla parity"

Browse Source 
This reverts commit 808b1cbde5.
This commit is contained in:
granny
2023-03-18 18:36:32 -07:00
parent 808b1cbde5
commit 09b5d5446b
136 changed files with 809 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0169-Breedable-parrots.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Breedable parrots
diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
index f7efb2088c554782fd169b901b4ef3fca3b2c0f9..629ced06cc17ebd6a359b74858d073e12c6a3b88 100644
index 9228dc98360ff34e4cdd105be36ed249c5b67067..6c57b093366019f78627f75bab2d710c6556c030 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
@@ -228,6 +228,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -50,10 +50,10 @@ index f7efb2088c554782fd169b901b4ef3fca3b2c0f9..629ced06cc17ebd6a359b74858d073e1
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2a69211d613757d61fb3fb86440042e1d2f8aa8d..6d36f8ef6d9534f5259133c3e7716861c1141cf3 100644
index e44f013dc36128facd1ef8ba40a2da1c30f6ccab..44ac29b4c92fd533e084567caf8f36e81b9dc853 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1550,6 +1550,7 @@ public class PurpurWorldConfig {
@@ -1567,6 +1567,7 @@ public class PurpurWorldConfig {
public double parrotMaxY = 320D;
public double parrotMaxHealth = 6.0D;
public boolean parrotTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index 2a69211d613757d61fb3fb86440042e1d2f8aa8d..6d36f8ef6d9534f5259133c3e7716861
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1562,6 +1563,7 @@ public class PurpurWorldConfig {
@@ -1579,6 +1580,7 @@ public class PurpurWorldConfig {
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);