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

Drop projectile despawn rates patch in favor of pufferfish's

Browse Source 
Fixes elBukkit/MagicPlugin#1042
Fixes elBukkit/MagicPlugin#816
This commit is contained in:
BillyGalbreath
2022-06-13 10:46:27 -05:00
parent c5dbf9cf10
commit 146750b2de
193 changed files with 978 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0073-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index bc3ffb8867d5f7c2fa548d31256341d388bf8112..6c1dd723373f9b1b920548de85aeb6ce
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da2ba6a3f9 100644
index 298289ec1f000391cec03734f238f2fb558a8a50..fee17cd019a98e685a2783387fee2061870fc066 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -574,6 +574,9 @@ public class PurpurWorldConfig {
@@ -577,6 +577,9 @@ public class PurpurWorldConfig {
public boolean drownedControllable = true;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -585,6 +588,9 @@ public class PurpurWorldConfig {
@@ -588,6 +591,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 fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
}
public boolean elderGuardianRidable = false;
@@ -833,6 +839,9 @@ public class PurpurWorldConfig {
@@ -836,6 +842,9 @@ public class PurpurWorldConfig {
public boolean huskControllable = true;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -844,6 +853,9 @@ public class PurpurWorldConfig {
@@ -847,6 +856,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 fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
}
public boolean illusionerRidable = false;
@@ -1653,6 +1665,9 @@ public class PurpurWorldConfig {
@@ -1656,6 +1668,9 @@ public class PurpurWorldConfig {
public boolean zombieControllable = true;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1664,6 +1679,9 @@ public class PurpurWorldConfig {
@@ -1667,6 +1682,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 fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
}
public boolean zombieHorseRidableInWater = false;
@@ -1698,6 +1716,9 @@ public class PurpurWorldConfig {
@@ -1701,6 +1719,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerControllable = true;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1709,6 +1730,9 @@ public class PurpurWorldConfig {
@@ -1712,6 +1733,9 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
}
public boolean zombifiedPiglinRidable = false;
@@ -1716,6 +1740,9 @@ public class PurpurWorldConfig {
@@ -1719,6 +1743,9 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinControllable = true;
public double zombifiedPiglinMaxHealth = 20.0D;
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index fb1d389cdfa47726718552fd92cf0035858792df..04e27b028782b46db7fc88d1ba14a4da
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1727,5 +1754,8 @@ public class PurpurWorldConfig {
@@ -1730,5 +1757,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);