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

stop mobs from targeting afk players (#564)

Browse Source 
Co-authored-by: Encode42 <me@encode42.dev>
This commit is contained in:
granny
2021-08-08 18:32:27 -07:00
committed by GitHub
parent 3c451101ac
commit fc79bca3c5
141 changed files with 502 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0076-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c1970439776b63 100644
index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1ea0dda024 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -518,6 +518,9 @@ public class PurpurWorldConfig {
@@ -520,6 +520,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -528,6 +531,9 @@ public class PurpurWorldConfig {
@@ -530,6 +533,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
}
public boolean elderGuardianRidable = false;
@@ -740,6 +746,9 @@ public class PurpurWorldConfig {
@@ -742,6 +748,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -750,6 +759,9 @@ public class PurpurWorldConfig {
@@ -752,6 +761,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
}
public boolean illusionerRidable = false;
@@ -1450,6 +1462,9 @@ public class PurpurWorldConfig {
@@ -1452,6 +1464,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1460,6 +1475,9 @@ public class PurpurWorldConfig {
@@ -1462,6 +1477,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
}
public boolean zombieHorseRidableInWater = false;
@@ -1493,6 +1511,9 @@ public class PurpurWorldConfig {
@@ -1495,6 +1513,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1503,12 +1524,18 @@ public class PurpurWorldConfig {
@@ -1505,12 +1526,18 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c19704
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1519,5 +1546,8 @@ public class PurpurWorldConfig {
@@ -1521,5 +1548,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);