9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00

Update purpur 1.19.4 upstream

This commit is contained in:
NONPLAYT
2023-06-10 12:09:55 +03:00
parent 38484297f0
commit baace97eb4
2 changed files with 8 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
group = gq.bxteam.divinemc
version = 1.19.4-R0.1-SNAPSHOT
purpurRef = ead09e2bf6dc3d8779f37c13f87e44ce40c89c26
purpurRef = 68862729138c74fed22a97b582f399a9c6eb9d79
org.gradle.caching = true
org.gradle.parallel = true

View File

@@ -219,10 +219,10 @@ index 0b2a5dc43ccba7d223cbdfd3f1dc539a6dab0444..01e10034ad8cd91d30c4c3dc7b372617
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..42f256bb6682d794f650e0acdee3c8b190827a1f 100644
index 397c4afa8da85845f49974832674a6e45ee6edb7..a09d72b3340ea66d17f9809c9f3e410a8f603c6c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1096,7 +1096,17 @@ public class PurpurWorldConfig {
@@ -1098,7 +1098,17 @@ public class PurpurWorldConfig {
public boolean allayRidableInWater = true;
public boolean allayControllable = true;
public List<String> allayRespectNBT = new ArrayList<>();
@@ -240,7 +240,7 @@ index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..42f256bb6682d794f650e0acdee3c8b1
allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
@@ -1207,7 +1217,18 @@ public class PurpurWorldConfig {
@@ -1209,7 +1219,18 @@ public class PurpurWorldConfig {
public double camelJumpStrengthMax = 0.42D;
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
@@ -259,7 +259,7 @@ index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..42f256bb6682d794f650e0acdee3c8b1
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
camelJumpStrengthMin = getDouble("mobs.camel.attributes.jump_strength.min", camelJumpStrengthMin);
@@ -1634,7 +1655,18 @@ public class PurpurWorldConfig {
@@ -1636,7 +1657,18 @@ public class PurpurWorldConfig {
public boolean frogControllable = true;
public float frogRidableJumpHeight = 0.65F;
public int frogBreedingTicks = 6000;
@@ -278,7 +278,7 @@ index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..42f256bb6682d794f650e0acdee3c8b1
frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
@@ -2585,7 +2617,16 @@ public class PurpurWorldConfig {
@@ -2587,7 +2619,16 @@ public class PurpurWorldConfig {
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
public int snifferBreedingTicks = 6000;
@@ -295,7 +295,7 @@ index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..42f256bb6682d794f650e0acdee3c8b1
snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
@@ -2684,7 +2725,18 @@ public class PurpurWorldConfig {
@@ -2686,7 +2727,18 @@ public class PurpurWorldConfig {
public boolean tadpoleRidable = false;
public boolean tadpoleRidableInWater = true;
public boolean tadpoleControllable = true;
@@ -314,7 +314,7 @@ index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..42f256bb6682d794f650e0acdee3c8b1
tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
@@ -2894,7 +2946,18 @@ public class PurpurWorldConfig {
@@ -2896,7 +2948,18 @@ public class PurpurWorldConfig {
public boolean wardenRidable = false;
public boolean wardenRidableInWater = true;
public boolean wardenControllable = true;