Add config toggle to arrow despawn reset patch

This commit is contained in:
Encode42
2022-07-19 23:42:56 -04:00
parent ebfdfe67ad
commit 3316c894de
133 changed files with 765 additions and 749 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Mob head visibility percent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 6e7af1939df4ff99d6d4645f7ed270110d9d0373..d120c8808c6a8df2c8615fe02f2c8a5b6a126d8e 100644
index 634363eb1c23e088b05d895565fb8ce9d3bdfb08..fd812571fef3782c03735ae8599845fc027c8e05 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1015,9 +1015,17 @@ public abstract class LivingEntity extends Entity {
@@ -29,10 +29,10 @@ index 6e7af1939df4ff99d6d4645f7ed270110d9d0373..d120c8808c6a8df2c8615fe02f2c8a5b
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5dff0bfe5c9f92213715b46f37c87f8da379780b..f19e95fecdf19bf56d456e4e35edbe0abe5d5839 100644
index 95ff1d59f4195c1d3815e36c7640aeca4b7a41e6..6f081554311a50678efb05e02bb4409cebe2a897 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1264,6 +1264,7 @@ public class PurpurWorldConfig {
@@ -1269,6 +1269,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -40,7 +40,7 @@ index 5dff0bfe5c9f92213715b46f37c87f8da379780b..f19e95fecdf19bf56d456e4e35edbe0a
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1281,6 +1282,7 @@ public class PurpurWorldConfig {
@@ -1286,6 +1287,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -48,7 +48,7 @@ index 5dff0bfe5c9f92213715b46f37c87f8da379780b..f19e95fecdf19bf56d456e4e35edbe0a
}
public boolean dolphinRidable = false;
@@ -2356,6 +2358,7 @@ public class PurpurWorldConfig {
@@ -2361,6 +2363,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -56,7 +56,7 @@ index 5dff0bfe5c9f92213715b46f37c87f8da379780b..f19e95fecdf19bf56d456e4e35edbe0a
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2368,6 +2371,7 @@ public class PurpurWorldConfig {
@@ -2373,6 +2376,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -64,7 +64,7 @@ index 5dff0bfe5c9f92213715b46f37c87f8da379780b..f19e95fecdf19bf56d456e4e35edbe0a
}
public boolean skeletonHorseRidableInWater = true;
@@ -2895,6 +2899,7 @@ public class PurpurWorldConfig {
@@ -2900,6 +2904,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -72,7 +72,7 @@ index 5dff0bfe5c9f92213715b46f37c87f8da379780b..f19e95fecdf19bf56d456e4e35edbe0a
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2913,6 +2918,7 @@ public class PurpurWorldConfig {
@@ -2918,6 +2923,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);