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

add camel attributes to config, fixes #1224

Browse Source
This commit is contained in:
granny
2023-01-20 02:44:41 -08:00
parent a1238c38b2
commit 15a76c78b1
78 changed files with 641 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0088-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7639f3872e3c98548973cb08edad17b1af1add1f..dbb02d7e0b0528c834a14489236670125a67db45 100644
index b3befc3ba8ffdd4aea1df37db6d1698887ef55d9..66cc082e197c6369c3cb92ab95d61f4b6703c504 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4153,6 +4153,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -54,10 +54,10 @@ index 68cc6f2a78a06293a29317fda72ab3ee79b3533a..cfb2e46b34b2982d6724f18214557fc8
+ // Purpur
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0ae4a84f953c5f68d50124e6446df88f276ad2f6..5a6da03ce41cc78a36dc0c4fb0f89bbbacb0a6da 100644
index 3f63fbafd6a8423a00dc7acaf224cecafde4a2bb..a070c21f49d59702df56409fa5c05f8eb05a0e22 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1457,6 +1457,7 @@ public class PurpurWorldConfig {
@@ -1474,6 +1474,7 @@ public class PurpurWorldConfig {
public boolean squidControllable = true;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -65,7 +65,7 @@ index 0ae4a84f953c5f68d50124e6446df88f276ad2f6..5a6da03ce41cc78a36dc0c4fb0f89bbb
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -1467,6 +1468,7 @@ public class PurpurWorldConfig {
@@ -1484,6 +1485,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);