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

reorganize patches

Browse Source
This commit is contained in:
granny
2023-06-09 03:22:44 -07:00
parent 237b71ba21
commit 91b9a1a0ce
26 changed files with 185 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch → patches/server/0065-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -258,26 +258,26 @@ index 2189058a752986179165fb904513796e7220438e..b0aad0632ed2c6004222a4715c2643ef
private float speed = 0.1F;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index aacee630b1f7a9c2bbcdf772df204e3d3ec4e52f..70576507db0a84b209729cdd2efa595bd0450042 100644
index d96d87fd198e54802712b8cfde2a0563812a3136..fd4c91cba23954d1614ad3d3cdb0b12d6ffdecaa 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1109,6 +1109,9 @@ public class PurpurWorldConfig {
@@ -1067,6 +1067,9 @@ public class PurpurWorldConfig {
public String phantomAttackDamage = "6 + size";
public Map<Integer, Double> phantomMaxHealthCache = new HashMap<>();
public Map<Integer, Double> phantomAttackDamageCache = new HashMap<>();
+ public double phantomAttackedByCrystalRadius = 0.0D;
+ public float phantomAttackedByCrystalDamage = 1.0F;
+ public double phantomOrbitCrystalRadius = 0.0D;
public int phantomSpawnMinSkyDarkness = 5;
public boolean phantomSpawnOnlyAboveSeaLevel = true;
public boolean phantomSpawnOnlyWithVisibleSky = true;
@@ -1136,6 +1139,9 @@ public class PurpurWorldConfig {
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1088,6 +1091,9 @@ public class PurpurWorldConfig {
phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage);
phantomMaxHealthCache.clear();
phantomAttackDamageCache.clear();
+ phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
+ phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
+ phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
phantomSpawnMinSkyDarkness = getInt("mobs.phantom.spawn.min-sky-darkness", phantomSpawnMinSkyDarkness);
phantomSpawnOnlyAboveSeaLevel = getBoolean("mobs.phantom.spawn.only-above-sea-level", phantomSpawnOnlyAboveSeaLevel);
phantomSpawnOnlyWithVisibleSky = getBoolean("mobs.phantom.spawn.only-with-visible-sky", phantomSpawnOnlyWithVisibleSky);
}
public boolean pigRidable = false;

18
patches/server/0065-Add-phantom-spawning-options.patch → patches/server/0066-Add-phantom-spawning-options.patch
View File

@@ -40,13 +40,13 @@ index bc7648dbc132551dc6591ab49a1919a623c30f60..5b880677c895d0e747a1ed6a380ae356
for (int l = 0; l < k; ++l) {
// Paper start
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index df8f8dcf6e47710b289df1996b571781009c9c00..930f6267cd90ebaee1a5819bcb67f81528692377 100644
index fd4c91cba23954d1614ad3d3cdb0b12d6ffdecaa..a6a71ea8dda8a1c42f3e32f9fccb9dc5366d9295 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1067,6 +1067,12 @@ public class PurpurWorldConfig {
public String phantomAttackDamage = "6 + size";
public Map<Integer, Double> phantomMaxHealthCache = new HashMap<>();
public Map<Integer, Double> phantomAttackDamageCache = new HashMap<>();
@@ -1070,6 +1070,12 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
+ public int phantomSpawnMinSkyDarkness = 5;
+ public boolean phantomSpawnOnlyAboveSeaLevel = true;
+ public boolean phantomSpawnOnlyWithVisibleSky = true;
@@ -56,10 +56,10 @@ index df8f8dcf6e47710b289df1996b571781009c9c00..930f6267cd90ebaee1a5819bcb67f815
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1088,6 +1094,12 @@ public class PurpurWorldConfig {
phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage);
phantomMaxHealthCache.clear();
phantomAttackDamageCache.clear();
@@ -1094,6 +1100,12 @@ public class PurpurWorldConfig {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
+ phantomSpawnMinSkyDarkness = getInt("mobs.phantom.spawn.min-sky-darkness", phantomSpawnMinSkyDarkness);
+ phantomSpawnOnlyAboveSeaLevel = getBoolean("mobs.phantom.spawn.only-above-sea-level", phantomSpawnOnlyAboveSeaLevel);
+ phantomSpawnOnlyWithVisibleSky = getBoolean("mobs.phantom.spawn.only-with-visible-sky", phantomSpawnOnlyWithVisibleSky);

2
patches/server/0066-Implement-bed-explosion-options.patch → patches/server/0067-Implement-bed-explosion-options.patch
View File

@@ -27,7 +27,7 @@ index d40500f9a807cab0b2fb6fa9032f33f4fb74c895..e8405a57fb88e63b63baaf00645c4176
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fa7bafbba960f987f4dac7a12fd3014efa8eebdb..4a1bd450223323ff04c92a2eac2e789d1e6c8920 100644
index a6a71ea8dda8a1c42f3e32f9fccb9dc5366d9295..2ff268a9bf92c151e7b0e5f0b075eb9fc72035a7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -290,6 +290,27 @@ public class PurpurWorldConfig {

2
patches/server/0067-Implement-respawn-anchor-explosion-options.patch → patches/server/0068-Implement-respawn-anchor-explosion-options.patch
View File

@@ -18,7 +18,7 @@ index 2ed78cf83c0ae66a6ddba1ff307da89a24b0d0a8..ae17d6a54fad0bd2d71d306f418b5ced
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4a1bd450223323ff04c92a2eac2e789d1e6c8920..fce1ffd5a1d04a2a90d6a6eecc3736c79ef515fb 100644
index 2ff268a9bf92c151e7b0e5f0b075eb9fc72035a7..70576507db0a84b209729cdd2efa595bd0450042 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -330,6 +330,27 @@ public class PurpurWorldConfig {

0
patches/server/0068-Add-allow-water-in-end-world-option.patch → patches/server/0069-Add-allow-water-in-end-world-option.patch
View File

6
patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch → patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -176,10 +176,10 @@ index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3
public static final VillagerProfession FISHERMAN = register("fisherman", PoiTypes.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = register("fletcher", PoiTypes.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dfb3e53954e7247199427ba8e35a97160af25d55..b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9 100644
index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..a22eefcf7929f8c36fdac4b96a7cdb70bc67e291 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1816,6 +1816,8 @@ public class PurpurWorldConfig {
@@ -1810,6 +1810,8 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -188,7 +188,7 @@ index dfb3e53954e7247199427ba8e35a97160af25d55..b4c1ab716d7428d663ddcaca9bb1a12f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1830,6 +1832,8 @@ public class PurpurWorldConfig {
@@ -1824,6 +1826,8 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);

6
patches/server/0111-Toggle-for-Zombified-Piglin-death-always-counting-as.patch → patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
View File

@@ -35,10 +35,10 @@ index 3d61b27c23d90e87fdfc8c170eafc116716ac047..67fd554cfd6b848ca1f2cf804ad4543a
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..cc3cc85b7119865a622dd61acc1c84708256876b 100644
index a22eefcf7929f8c36fdac4b96a7cdb70bc67e291..f1b84d4c4e19133e1d9b96c66dea83878469861e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2045,6 +2045,7 @@ public class PurpurWorldConfig {
@@ -2049,6 +2049,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..cc3cc85b7119865a622dd61acc1c8470
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2059,5 +2060,6 @@ public class PurpurWorldConfig {
@@ -2063,5 +2064,6 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);

6
patches/server/0112-Configurable-chance-for-wolves-to-spawn-rabid.patch → patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -221,10 +221,10 @@ index e43fd3e59fd8c74828ae65965fade27f56beef65..b2f133c8baabba1cffa6e92ea0f85453
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cc3cc85b7119865a622dd61acc1c84708256876b..6e656c74019f44b804ea6734139b3859d2a2b1df 100644
index f1b84d4c4e19133e1d9b96c66dea83878469861e..f30d14be52e736a14f3fde8be1b37e4c20ee80e2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1935,6 +1935,8 @@ public class PurpurWorldConfig {
@@ -1939,6 +1939,8 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -233,7 +233,7 @@ index cc3cc85b7119865a622dd61acc1c84708256876b..6e656c74019f44b804ea6734139b3859
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1946,6 +1948,8 @@ public class PurpurWorldConfig {
@@ -1950,6 +1952,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0113-Configurable-default-collar-color.patch → patches/server/0114-Configurable-default-collar-color.patch
View File

@@ -43,7 +43,7 @@ index aa484d03ed31f6c60c0b4456a4047bc38a40ea4a..89627025c0b5464900a5ea818c7aaf5d
protected void registerGoals() {
this.goalSelector.addGoal(1, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6e656c74019f44b804ea6734139b3859d2a2b1df..dfb3e53954e7247199427ba8e35a97160af25d55 100644
index f30d14be52e736a14f3fde8be1b37e4c20ee80e2..b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -620,6 +620,7 @@ public class PurpurWorldConfig {
@@ -66,7 +66,7 @@ index 6e656c74019f44b804ea6734139b3859d2a2b1df..dfb3e53954e7247199427ba8e35a9716
}
public boolean caveSpiderRidable = false;
@@ -1935,6 +1941,7 @@ public class PurpurWorldConfig {
@@ -1939,6 +1945,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -74,7 +74,7 @@ index 6e656c74019f44b804ea6734139b3859d2a2b1df..dfb3e53954e7247199427ba8e35a9716
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1948,6 +1955,11 @@ public class PurpurWorldConfig {
@@ -1952,6 +1959,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

4
patches/server/0157-Configurable-sponge-absorption.patch → patches/server/0153-Configurable-sponge-absorption.patch
View File

@@ -21,10 +21,10 @@ index 4bce895268542531598a01a1bccd8ac1ed703b7d..e4e926dc89f843886d0df5da31e00053
int i = aenumdirection.length;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a0fd04f892e39805a655216e029bb077847f809c..644652189ca1b173776537fa9d17aa31b38cdfe1 100644
index 5c53c323296fc264f6a436b78c7def11deb742d2..cbc07c2cc6166293fa2f5af64abf9d20ac57b2d3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -657,6 +657,13 @@ public class PurpurWorldConfig {
@@ -635,6 +635,13 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

2
patches/server/0153-Projectile-offset-config.patch → patches/server/0154-Projectile-offset-config.patch
View File

@@ -96,7 +96,7 @@ index 06c2f30b77a2c8aecc65e0c305f643d53798f364..6d1573161f0d8c7999f84925ba7bbf53
entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5c53c323296fc264f6a436b78c7def11deb742d2..bf2dc4fe37df03728d711952eeabf3882b61c22e 100644
index cbc07c2cc6166293fa2f5af64abf9d20ac57b2d3..53a98b4131a84bdcdfa618dd3e11fbe5a3a88e3a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -428,6 +428,23 @@ public class PurpurWorldConfig {

2
patches/server/0154-Config-for-powered-rail-activation-distance.patch → patches/server/0155-Config-for-powered-rail-activation-distance.patch
View File

@@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
} else {
int j = pos.getX();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bf2dc4fe37df03728d711952eeabf3882b61c22e..d2305b276252c76ed90aeef0a0e245261b6be348 100644
index 53a98b4131a84bdcdfa618dd3e11fbe5a3a88e3a..5e0648856dcb71f218464d8b0b74e00e2d520efa 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -621,6 +621,11 @@ public class PurpurWorldConfig {

6
patches/server/0155-Piglin-portal-spawn-modifier.patch → patches/server/0156-Piglin-portal-spawn-modifier.patch
View File

@@ -31,10 +31,10 @@ index 2c085c4a154cb0f8a1d38453f43474a764398784..589b437e7c97c846410f293e2f014bdc
pos = pos.below();
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d2305b276252c76ed90aeef0a0e245261b6be348..a0fd04f892e39805a655216e029bb077847f809c 100644
index 5e0648856dcb71f218464d8b0b74e00e2d520efa..644652189ca1b173776537fa9d17aa31b38cdfe1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1642,6 +1642,7 @@ public class PurpurWorldConfig {
@@ -1649,6 +1649,7 @@ public class PurpurWorldConfig {
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
public boolean piglinTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index d2305b276252c76ed90aeef0a0e245261b6be348..a0fd04f892e39805a655216e029bb077
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1654,6 +1655,7 @@ public class PurpurWorldConfig {
@@ -1661,6 +1662,7 @@ public class PurpurWorldConfig {
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);

0
patches/server/0156-Config-to-change-max-number-of-bees.patch → patches/server/0157-Config-to-change-max-number-of-bees.patch
View File

2
patches/server/0230-Signs-allow-color-codes.patch → patches/server/0226-Signs-allow-color-codes.patch
View File

@@ -67,7 +67,7 @@ index 80695b2698d2904cec2c54ebe0ef880d95ed9583..c884b119fd956c3543864f06c1b1cd60
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c70fc012709293fd01d996a55a49d500cd148d33..f00d995a35fe7c33f2c5d1fffeb5d46b12b26e6f 100644
index 00e147d0097e4797b378310154942a141f6e1298..75e0a56a381e05f0b99e7e7b85d38b4219a5da95 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -958,6 +958,11 @@ public class PurpurWorldConfig {

0
patches/server/0226-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch → patches/server/0227-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
View File

274
patches/server/0227-Mobs-always-drop-experience.patch → patches/server/0228-Mobs-always-drop-experience.patch
View File

File diff suppressed because it is too large Load Diff

0
patches/server/0228-Potion-NamespacedKey.patch → patches/server/0229-Potion-NamespacedKey.patch
View File

0
patches/server/0229-Grindstone-API.patch → patches/server/0230-Grindstone-API.patch
View File

8
patches/server/0275-Remove-Timings.patch → patches/server/0272-Remove-Timings.patch
View File

@@ -600,10 +600,10 @@ index c490c88fd7798c0ac186b1de22a0dfc433adc431..48e259562bd46075e4d64ed1a291e32c
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c38f235b069b85e6ad6ebd0bdd528a109b310350..9440d259e3dd5f9b47186980c44e2ac4b54dfcd0 100644
index d3158d0bea38780463e7fcc4cf2a27f96eef3331..1205b3099fdaa56e2d45e46b650fb602892e9c8b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2594,7 +2594,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2585,7 +2585,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -612,7 +612,7 @@ index c38f235b069b85e6ad6ebd0bdd528a109b310350..9440d259e3dd5f9b47186980c44e2ac4
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2604,7 +2604,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2595,7 +2595,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -621,7 +621,7 @@ index c38f235b069b85e6ad6ebd0bdd528a109b310350..9440d259e3dd5f9b47186980c44e2ac4
return;
}
@@ -2617,7 +2617,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2608,7 +2608,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
return;
} finally {

4
patches/server/0278-Remove-Mojang-Profiler.patch → patches/server/0273-Remove-Mojang-Profiler.patch
View File

@@ -793,7 +793,7 @@ index a155e61a95c0fe4fc16d6d18a02a83b6d5b2a930..c3bb1f0d4ea44d88f2f5453e9fc8b109
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9440d259e3dd5f9b47186980c44e2ac4b54dfcd0..bf9635072d4ffc298a5221309bdf329c67e0451a 100644
index 1205b3099fdaa56e2d45e46b650fb602892e9c8b..eb62c04013d981390524beb74dc37bc2443b844c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -410,7 +410,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1770,7 +1770,7 @@ index b4bfddb406fce51d1100976d9445db161dcb3f22..57fceb21ca6bc536a6faf04dbc8ddc78
}
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index dc20ef09fd47f95639ca3de237efe41765fb4cb9..029cceb339c86abe05d9eee944b60c081bffd804 100644
index 4e2611c9a7df8343f76e3be3f01f2f828cdf8a1d..03fc9c6ef0fb320924038f2730c6f08426f0842c 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -132,7 +132,7 @@ public final class NaturalSpawner {

2
patches/server/0272-Add-more-logger-output-for-invalid-movement-kicks.patch → patches/server/0274-Add-more-logger-output-for-invalid-movement-kicks.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d3158d0bea38780463e7fcc4cf2a27f96eef3331..c38f235b069b85e6ad6ebd0bdd528a109b310350 100644
index eb62c04013d981390524beb74dc37bc2443b844c..bf9635072d4ffc298a5221309bdf329c67e0451a 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -865,6 +865,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

0
patches/server/0273-Add-Bee-API.patch → patches/server/0275-Add-Bee-API.patch
View File

0
patches/server/0274-Debug-Marker-API.patch → patches/server/0276-Debug-Marker-API.patch
View File

2
patches/server/0276-mob-spawning-option-to-ignore-creative-players.patch → patches/server/0277-mob-spawning-option-to-ignore-creative-players.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] mob spawning option to ignore creative players
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 4e2611c9a7df8343f76e3be3f01f2f828cdf8a1d..dc20ef09fd47f95639ca3de237efe41765fb4cb9 100644
index 03fc9c6ef0fb320924038f2730c6f08426f0842c..029cceb339c86abe05d9eee944b60c081bffd804 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -260,7 +260,7 @@ public final class NaturalSpawner {

0
patches/server/0277-Add-skeleton-bow-accuracy-option.patch → patches/server/0278-Add-skeleton-bow-accuracy-option.patch
View File