mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Preliminary update to 1.17.1
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 0fa7a658af3dc1766e06d90d396a426c558917ab..5c82dd279fc3a5847e2e0ed6c9cf9e70acfb3bff 100644
|
||||
index 3bda2f895612cb5bfd6205a675c03edc6a2270d6..fb031a1da8f1df142155ffb368ccc082da776e97 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -1674,7 +1674,7 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -1678,7 +1678,7 @@ public abstract class LivingEntity extends Entity {
|
||||
boolean flag = false;
|
||||
|
||||
if (this.dead && adversary instanceof WitherBoss) { // Paper
|
||||
@@ -18,10 +18,10 @@ index 0fa7a658af3dc1766e06d90d396a426c558917ab..5c82dd279fc3a5847e2e0ed6c9cf9e70
|
||||
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
index 13b256c7d9723e38d1a1f5766fb2a28bc26f8943..a397a4bd2deb682d1465a305731cee0d911e64af 100644
|
||||
index 20af97629b614da792bdee2f8e450433570102f2..713b80dde1f6cf3ba516513873c949a57047a566 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -656,7 +656,7 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -657,7 +657,7 @@ public abstract class Mob extends LivingEntity {
|
||||
public void aiStep() {
|
||||
super.aiStep();
|
||||
this.level.getProfiler().push("looting");
|
||||
@@ -131,7 +131,7 @@ index 1697b573ffd0c5d17d2d538c40f5ce4b709f261a..69bb27e8223b4be0e410ab9dd10e4db2
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||
index a70c631691512a633c7fe4df9e9f2881f7397298..0324f69918de432e6e726fee3bd8e86c7d180523 100644
|
||||
index f637cd740ec3801ce1c387473b5c4ff6080e76ec..3247f3f3c9d53953f8268c8f9575275126cf33a3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||
@@ -560,7 +560,7 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -144,7 +144,7 @@ index a70c631691512a633c7fe4df9e9f2881f7397298..0324f69918de432e6e726fee3bd8e86c
|
||||
// flag1 = this.level.a(blockposition, false) || flag1;
|
||||
flag1 = true;
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||
index 689df66281ef84f0cc31d89c6f2e654c9f3a5150..15d35d325b66e1a417eb7ba699597d627bd4eb54 100644
|
||||
index 5f24fb3fc4ffb2e032cf755d984716d1c3a3e965..232fe770b9befacc4d436a01139fe5fe46f92879 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||
@@ -375,7 +375,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -290,7 +290,7 @@ index e69213b43c8aa5a7c04add7a87482d531fbf52d2..f51ea103238b4a50439f5162a248cd9a
|
||||
// CraftBukkit start - fire ExplosionPrimeEvent
|
||||
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
index 9a5da1eec68c7c435406809fda9695cbd54ba6c5..24a95bbee394dae1a3eac937990cae10a287a40b 100644
|
||||
index cecdafb496669419911ac7ea6db5a69f71f9be13..facd45496e966fe973de2e4cde93f01297932669 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
@@ -290,6 +290,6 @@ public abstract class Projectile extends Entity {
|
||||
@@ -354,7 +354,7 @@ index 6dda5eeca4e310eceb2598322803bfafc184e9c7..3c51e6d419a244b9270119590aa29952
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
||||
index 2d4d59eb5a534e4c283933b734c44776b674b2eb..aad204181c4f54ee533bfe3fc04a8705b847e371 100644
|
||||
index 9fb0464f74bcbb757171290ae44f4a4c7ea4d499..668724cfaf9f34fe057171b69213782a22f8013b 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
|
||||
@@ -82,7 +82,7 @@ public class FarmBlock extends Block {
|
||||
@@ -393,10 +393,10 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
|
||||
return true;
|
||||
// Purpur end
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac884adee0f 100644
|
||||
index 5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4..315e24bc0ef9950f68260e2f5aefbe0b7d421a1b 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -368,9 +368,12 @@ public class PurpurWorldConfig {
|
||||
@@ -367,9 +367,12 @@ public class PurpurWorldConfig {
|
||||
public boolean boatsDoFallDamage = true;
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
public boolean entitiesCanUsePortals = true;
|
||||
@@ -409,7 +409,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
||||
public double voidDamageHeight = -64.0D;
|
||||
public double voidDamageDealt = 4.0D;
|
||||
@@ -382,9 +385,12 @@ public class PurpurWorldConfig {
|
||||
@@ -381,9 +384,12 @@ public class PurpurWorldConfig {
|
||||
boatsDoFallDamage = getBoolean("gameplay-mechanics.boat.do-fall-damage", boatsDoFallDamage);
|
||||
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
|
||||
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
|
||||
@@ -422,7 +422,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
|
||||
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
|
||||
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
|
||||
@@ -454,9 +460,11 @@ public class PurpurWorldConfig {
|
||||
@@ -453,9 +459,11 @@ public class PurpurWorldConfig {
|
||||
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
|
||||
}
|
||||
|
||||
@@ -434,7 +434,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
|
||||
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
|
||||
}
|
||||
@@ -488,6 +496,11 @@ public class PurpurWorldConfig {
|
||||
@@ -487,6 +495,11 @@ public class PurpurWorldConfig {
|
||||
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
|
||||
}
|
||||
|
||||
@@ -446,7 +446,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
public boolean respawnAnchorExplode = true;
|
||||
public double respawnAnchorExplosionPower = 5.0D;
|
||||
public boolean respawnAnchorExplosionFire = true;
|
||||
@@ -521,6 +534,11 @@ public class PurpurWorldConfig {
|
||||
@@ -520,6 +533,11 @@ public class PurpurWorldConfig {
|
||||
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
|
||||
}
|
||||
|
||||
@@ -458,7 +458,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
public double twistingVinesGrowthModifier = 0.10D;
|
||||
public int twistingVinesMaxGrowthAge = 25;
|
||||
private void twistingVinesSettings() {
|
||||
@@ -699,6 +717,7 @@ public class PurpurWorldConfig {
|
||||
@@ -698,6 +716,7 @@ public class PurpurWorldConfig {
|
||||
public double creeperMaxHealth = 20.0D;
|
||||
public double creeperChargedChance = 0.0D;
|
||||
public boolean creeperAllowGriefing = true;
|
||||
@@ -466,7 +466,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void creeperSettings() {
|
||||
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
|
||||
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
|
||||
@@ -710,6 +729,7 @@ public class PurpurWorldConfig {
|
||||
@@ -709,6 +728,7 @@ public class PurpurWorldConfig {
|
||||
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
|
||||
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
|
||||
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
|
||||
@@ -474,7 +474,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean dolphinRidable = false;
|
||||
@@ -797,6 +817,7 @@ public class PurpurWorldConfig {
|
||||
@@ -796,6 +816,7 @@ public class PurpurWorldConfig {
|
||||
public double enderDragonMaxY = 256D;
|
||||
public double enderDragonMaxHealth = 200.0D;
|
||||
public boolean enderDragonAlwaysDropsFullExp = false;
|
||||
@@ -482,7 +482,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void enderDragonSettings() {
|
||||
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
|
||||
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
|
||||
@@ -812,6 +833,7 @@ public class PurpurWorldConfig {
|
||||
@@ -811,6 +832,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
|
||||
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
|
||||
@@ -490,7 +490,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean endermanRidable = false;
|
||||
@@ -819,6 +841,7 @@ public class PurpurWorldConfig {
|
||||
@@ -818,6 +840,7 @@ public class PurpurWorldConfig {
|
||||
public double endermanMaxHealth = 40.0D;
|
||||
public boolean endermanAllowGriefing = true;
|
||||
public boolean endermanDespawnEvenWithBlock = false;
|
||||
@@ -498,7 +498,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void endermanSettings() {
|
||||
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
|
||||
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
|
||||
@@ -830,6 +853,7 @@ public class PurpurWorldConfig {
|
||||
@@ -829,6 +852,7 @@ public class PurpurWorldConfig {
|
||||
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
|
||||
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
|
||||
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
|
||||
@@ -506,7 +506,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean endermiteRidable = false;
|
||||
@@ -849,6 +873,7 @@ public class PurpurWorldConfig {
|
||||
@@ -848,6 +872,7 @@ public class PurpurWorldConfig {
|
||||
public boolean evokerRidable = false;
|
||||
public boolean evokerRidableInWater = false;
|
||||
public double evokerMaxHealth = 24.0D;
|
||||
@@ -514,7 +514,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void evokerSettings() {
|
||||
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
|
||||
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
|
||||
@@ -858,6 +883,7 @@ public class PurpurWorldConfig {
|
||||
@@ -857,6 +882,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.evoker.attributes.max_health", oldValue);
|
||||
}
|
||||
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
|
||||
@@ -522,7 +522,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean foxRidable = false;
|
||||
@@ -865,6 +891,7 @@ public class PurpurWorldConfig {
|
||||
@@ -864,6 +890,7 @@ public class PurpurWorldConfig {
|
||||
public double foxMaxHealth = 10.0D;
|
||||
public boolean foxTypeChangesWithTulips = false;
|
||||
public int foxBreedingTicks = 6000;
|
||||
@@ -530,7 +530,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void foxSettings() {
|
||||
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
|
||||
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
|
||||
@@ -876,6 +903,7 @@ public class PurpurWorldConfig {
|
||||
@@ -875,6 +902,7 @@ public class PurpurWorldConfig {
|
||||
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
|
||||
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
|
||||
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
|
||||
@@ -538,7 +538,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean ghastRidable = false;
|
||||
@@ -1271,6 +1299,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1270,6 +1298,7 @@ public class PurpurWorldConfig {
|
||||
public boolean piglinRidable = false;
|
||||
public boolean piglinRidableInWater = false;
|
||||
public double piglinMaxHealth = 16.0D;
|
||||
@@ -546,7 +546,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void piglinSettings() {
|
||||
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
|
||||
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
|
||||
@@ -1280,6 +1309,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1279,6 +1308,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.piglin.attributes.max_health", oldValue);
|
||||
}
|
||||
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
|
||||
@@ -554,7 +554,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean piglinBruteRidable = false;
|
||||
@@ -1299,6 +1329,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1298,6 +1328,7 @@ public class PurpurWorldConfig {
|
||||
public boolean pillagerRidable = false;
|
||||
public boolean pillagerRidableInWater = false;
|
||||
public double pillagerMaxHealth = 24.0D;
|
||||
@@ -562,7 +562,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void pillagerSettings() {
|
||||
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
|
||||
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
|
||||
@@ -1308,6 +1339,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1307,6 +1338,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.pillager.attributes.max_health", oldValue);
|
||||
}
|
||||
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
|
||||
@@ -570,7 +570,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean polarBearRidable = false;
|
||||
@@ -1349,6 +1381,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1348,6 +1380,7 @@ public class PurpurWorldConfig {
|
||||
public double rabbitNaturalToast = 0.0D;
|
||||
public double rabbitNaturalKiller = 0.0D;
|
||||
public int rabbitBreedingTicks = 6000;
|
||||
@@ -578,7 +578,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void rabbitSettings() {
|
||||
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
|
||||
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
|
||||
@@ -1361,11 +1394,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1360,11 +1393,13 @@ public class PurpurWorldConfig {
|
||||
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
|
||||
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
|
||||
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
|
||||
@@ -592,7 +592,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void ravagerSettings() {
|
||||
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
|
||||
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
|
||||
@@ -1375,6 +1410,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1374,6 +1409,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.ravager.attributes.max_health", oldValue);
|
||||
}
|
||||
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
|
||||
@@ -600,7 +600,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean salmonRidable = false;
|
||||
@@ -1393,6 +1429,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1392,6 +1428,7 @@ public class PurpurWorldConfig {
|
||||
public boolean sheepRidableInWater = false;
|
||||
public double sheepMaxHealth = 8.0D;
|
||||
public int sheepBreedingTicks = 6000;
|
||||
@@ -608,7 +608,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void sheepSettings() {
|
||||
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
|
||||
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
|
||||
@@ -1403,6 +1440,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1402,6 +1439,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
|
||||
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
|
||||
@@ -616,7 +616,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean shulkerRidable = false;
|
||||
@@ -1422,6 +1460,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1421,6 +1459,7 @@ public class PurpurWorldConfig {
|
||||
public boolean silverfishRidable = false;
|
||||
public boolean silverfishRidableInWater = false;
|
||||
public double silverfishMaxHealth = 8.0D;
|
||||
@@ -624,7 +624,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void silverfishSettings() {
|
||||
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
|
||||
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
|
||||
@@ -1431,6 +1470,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1430,6 +1469,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.silverfish.attributes.max_health", oldValue);
|
||||
}
|
||||
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
|
||||
@@ -632,7 +632,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean skeletonRidable = false;
|
||||
@@ -1498,6 +1538,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1497,6 +1537,7 @@ public class PurpurWorldConfig {
|
||||
public int snowGolemSnowBallMax = 20;
|
||||
public float snowGolemSnowBallModifier = 10.0F;
|
||||
public double snowGolemAttackDistance = 1.25D;
|
||||
@@ -640,7 +640,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void snowGolemSettings() {
|
||||
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
|
||||
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
|
||||
@@ -1514,6 +1555,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1513,6 +1554,7 @@ public class PurpurWorldConfig {
|
||||
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
|
||||
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
|
||||
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
|
||||
@@ -648,7 +648,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean squidRidable = false;
|
||||
@@ -1673,6 +1715,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1672,6 +1714,7 @@ public class PurpurWorldConfig {
|
||||
public int villagerLobotomizeCheck = 60;
|
||||
public boolean villagerClericsFarmWarts = false;
|
||||
public boolean villagerClericFarmersThrowWarts = true;
|
||||
@@ -656,7 +656,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1699,6 +1742,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1698,6 +1741,7 @@ public class PurpurWorldConfig {
|
||||
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
|
||||
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
|
||||
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
|
||||
@@ -664,7 +664,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean vindicatorRidable = false;
|
||||
@@ -1755,6 +1799,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1754,6 +1798,7 @@ public class PurpurWorldConfig {
|
||||
public double witherMaxHealth = 300.0D;
|
||||
public float witherHealthRegenAmount = 1.0f;
|
||||
public int witherHealthRegenDelay = 20;
|
||||
@@ -672,7 +672,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void witherSettings() {
|
||||
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
|
||||
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
|
||||
@@ -1771,6 +1816,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1770,6 +1815,7 @@ public class PurpurWorldConfig {
|
||||
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
|
||||
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
|
||||
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
|
||||
@@ -680,7 +680,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
}
|
||||
|
||||
public boolean witherSkeletonRidable = false;
|
||||
@@ -1838,6 +1884,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1837,6 +1883,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieJockeyTryExistingChickens = true;
|
||||
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
|
||||
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
|
||||
@@ -688,7 +688,7 @@ index b61ae4082a76056b9b8e115eb604e860603da875..a9cda879921260f350277cf49d11eac8
|
||||
private void zombieSettings() {
|
||||
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
|
||||
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
|
||||
@@ -1857,6 +1904,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1856,6 +1903,7 @@ public class PurpurWorldConfig {
|
||||
} catch (IllegalArgumentException ignore) {
|
||||
zombieBreakDoorMinDifficulty = Difficulty.HARD;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user