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

fix config options in patches

Browse Source
This commit is contained in:
granny
2023-06-09 04:33:41 -07:00
parent 91b9a1a0ce
commit 9bed3af997
94 changed files with 603 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/server/0207-Conduit-behavior-configuration.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Encode42 <me@encode42.dev>
Date: Sun, 8 Aug 2021 18:14:31 -0400
From: granny <granny@purpurmc.org>
Date: Fri, 9 Jun 2023 04:12:23 -0700
Subject: [PATCH] Conduit behavior configuration
@@ -77,13 +77,14 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
});
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8d8a4666b98e91d31976e72e261ee33886004520..e3e77d8745259edaccc21ffb3e2658b55f54495a 100644
index 37b4c1ca0337b4e512e90ceeae9f741527f43b49..db47831cb239219d869f95275b5572f680631650 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -969,6 +969,29 @@ public class PurpurWorldConfig {
@@ -2814,5 +2814,28 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
+
+ public int conduitDistance = 16;
+ public double conduitDamageDistance = 8;
+ public float conduitDamageAmount = 4;
@@ -106,7 +107,5 @@ index 8d8a4666b98e91d31976e72e261ee33886004520..e3e77d8745259edaccc21ffb3e2658b5
+ });
+ conduitBlocks = conduitBlockList.toArray(Block[]::new);
+ }
+
public boolean babiesAreRidable = true;
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
}