save stuff here

This commit is contained in:
Ben Kerllenevich
2023-06-09 00:01:03 -04:00
parent 0b3c94c72d
commit 8768f54932
159 changed files with 4276 additions and 3663 deletions

View File

@@ -13,7 +13,7 @@ Subject: [PATCH] Shulker spawn from bullet options
(7 - 1) / 5.0 = 1.2 1.0 - 1.2 = -0.2 0% (6 other shulkers)
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index f328cac216a0f2a3e4956ab65d083caf072351d0..c31f7a4def4d56520b73fcfd99fcf4bd0d548e04 100644
index 8680668d97cbb737a72315ff5d3a68b30d14ffa6..48fcfef45ab149328573f4e80c8f0289f9eebbe8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -513,12 +513,21 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -68,11 +68,11 @@ index 88e1c2431d51d8cdc3d555b711e506648225d289..ac8735cc9d127fc1f867b40d4000c033
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7eeb5e81daf436a365ffcd3c2bebae5f7d10b7fc..7b30ffbeea1cc18a86d417bb0a522d1a4d940bff 100644
index 726563fc0c847030a4d25f3d6285340040fb618f..6751b12798c304c845812113fd4b88ed0958c1f7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1620,6 +1620,11 @@ public class PurpurWorldConfig {
@@ -1930,6 +1930,11 @@ public class PurpurWorldConfig {
public boolean shulkerControllable = true;
public double shulkerMaxHealth = 30.0D;
public boolean shulkerTakeDamageFromWater = false;
+ public float shulkerSpawnFromBulletBaseChance = 1.0F;
@@ -81,9 +81,9 @@ index 7eeb5e81daf436a365ffcd3c2bebae5f7d10b7fc..7b30ffbeea1cc18a86d417bb0a522d1a
+ public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
+ public boolean shulkerSpawnFromBulletRandomColor = false;
private void shulkerSettings() {
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.shulker.attributes.max-health", shulkerMaxHealth);
@@ -1628,6 +1633,11 @@ public class PurpurWorldConfig {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -1941,6 +1946,11 @@ public class PurpurWorldConfig {
}
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
shulkerTakeDamageFromWater = getBoolean("mobs.shulker.takes-damage-from-water", shulkerTakeDamageFromWater);
@@ -94,4 +94,4 @@ index 7eeb5e81daf436a365ffcd3c2bebae5f7d10b7fc..7b30ffbeea1cc18a86d417bb0a522d1a
+ shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);
}
public double silverfishMaxHealth = 8.0D;
public boolean silverfishRidable = false;