mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Rebase on latest Purpur (#230)
This commit is contained in:
@@ -32,10 +32,10 @@ index 762fed5ba27474951c1962e6f034e8494b1035d6..567a1da3c167c20ae3fb86c2a1f3608e
|
||||
this.bB.bC = this;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 6b44bc7efdfe992302782d23f5a6a46265d31f6d..e3aee2e73b453105b47aaa5a38b07b54f3406138 100644
|
||||
index 0d970ee7a6a38d2ecd920176acd7b43831d776bc..bdfa0908692db012c437e78428bc5fa0e0c62c42 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1063,6 +1063,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1075,6 +1075,7 @@ public class PurpurWorldConfig {
|
||||
|
||||
public boolean llamaRidable = false;
|
||||
public boolean llamaRidableInWater = false;
|
||||
@@ -43,7 +43,7 @@ index 6b44bc7efdfe992302782d23f5a6a46265d31f6d..e3aee2e73b453105b47aaa5a38b07b54
|
||||
public int llamaBreedingTicks = 6000;
|
||||
public double llamaMaxHealthMin = 15.0D;
|
||||
public double llamaMaxHealthMax = 30.0D;
|
||||
@@ -1073,6 +1074,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1085,6 +1086,7 @@ public class PurpurWorldConfig {
|
||||
private void llamaSettings() {
|
||||
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
|
||||
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
|
||||
|
||||
Reference in New Issue
Block a user