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

remove settings with PurpurPacks

Browse Source
This commit is contained in:
Ben Kerllenevich
2023-06-11 21:49:36 -04:00
parent 188f461ccf
commit 866df4ad0e
112 changed files with 287 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0196-Big-dripleaf-tilt-delay.patch → patches/server/0195-Big-dripleaf-tilt-delay.patch
View File

@@ -24,7 +24,7 @@ index 7455847cf8a05ed237d2df84ae2d9b1d2f2d7176..2960f5e35012665939c2d670d212aa4d
if (i != -1) {
world.scheduleTick(blockposition, (Block) this, i);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a749e65e66002c31fd83183744b5cfc4c036b0f6..e8a8c696eb736d48cd942419436bf5ef5e526a3c 100644
index 4e84330a39bbcb8e04996b667b02c85a8bee4ae3..35ea71e23c9d9babd25bb5e86c7705ba33c4042f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -730,6 +730,22 @@ public class PurpurWorldConfig {
@@ -47,6 +47,6 @@ index a749e65e66002c31fd83183744b5cfc4c036b0f6..e8a8c696eb736d48cd942419436bf5ef
+ });
+ }
+
public boolean buddingAmethystSilkTouch = false;
private void buddingAmethystSettings() {
buddingAmethystSilkTouch = getBoolean("blocks.budding_amethyst.silk-touch", buddingAmethystSilkTouch);
public boolean chestOpenWithBlockOnTop = false;
private void chestSettings() {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);

46
patches/server/0195-Silk-touchable-budding-amethyst.patch
View File

@@ -1,46 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 16 Jul 2021 22:00:17 -0500
Subject: [PATCH] Silk touchable budding amethyst
diff --git a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
index 4dae2a98070affd84bc4523a927dc9cbfe7379c6..51faa4cfda3d36f2e3bc7cbc47cacf57d3ca716e 100644
--- a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
@@ -47,4 +47,14 @@ public class BuddingAmethystBlock extends AmethystBlock {
public static boolean canClusterGrowAtState(BlockState state) {
return state.isAir() || state.is(Blocks.WATER) && state.getFluidState().getAmount() == 8;
}
+
+ // Purpur start
+ @Override
+ public void playerDestroy(net.minecraft.world.level.Level level, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, net.minecraft.world.level.block.entity.BlockEntity blockEntity, net.minecraft.world.item.ItemStack stack) {
+ if (level.purpurConfig.buddingAmethystSilkTouch && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.SILK_TOUCH, stack) > 0) {
+ popResource(level, pos, net.minecraft.world.item.Items.BUDDING_AMETHYST.getDefaultInstance());
+ }
+ super.playerDestroy(level, player, pos, state, blockEntity, stack);
+ }
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4e84330a39bbcb8e04996b667b02c85a8bee4ae3..1b2c79655b7c2a1b42a8a96f763115c134a88253 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -730,6 +730,11 @@ public class PurpurWorldConfig {
}
}
+ public boolean buddingAmethystSilkTouch = false;
+ private void buddingAmethystSettings() {
+ buddingAmethystSilkTouch = getBoolean("blocks.budding_amethyst.silk-touch", buddingAmethystSilkTouch);
+ }
+
public boolean chestOpenWithBlockOnTop = false;
private void chestSettings() {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
@@ -2776,3 +2781,4 @@ public class PurpurWorldConfig {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
}
+

2
patches/server/0197-Player-ridable-in-water-option.patch → patches/server/0196-Player-ridable-in-water-option.patch
View File

@@ -21,7 +21,7 @@ index 528aeec3f322ee2094098093e6016e41ff382cf3..0a9d8b22c7127b87826d9d256a5f36c3
if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) {
if (this.getShoulderEntityLeft().isEmpty()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e8a8c696eb736d48cd942419436bf5ef5e526a3c..255411a070a06bf71adac3abffc6342add068ff0 100644
index 35ea71e23c9d9babd25bb5e86c7705ba33c4042f..4f8541c1b9864ab2f902f0b1a43dccd404678006 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -400,6 +400,7 @@ public class PurpurWorldConfig {

6
patches/server/0198-Config-to-disable-Enderman-teleport-on-projectile-hi.patch → patches/server/0197-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
View File

@@ -17,10 +17,10 @@ index 1c8e2813ee24a73a8f83c74b90dc5f6eafe3689d..8db82eaa2355b15aa78fc9500368acf2
for (int i = 0; i < 64; ++i) {
if (this.teleport()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 022d9f52ce7203a4e06f2b14fc10cdacf22649f3..4f4d7769692b1dee23c74dfd34a6ef138da8076d 100644
index 4f8541c1b9864ab2f902f0b1a43dccd404678006..2811a4bff8a29d5975528d572320fb34e726b032 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1359,6 +1359,7 @@ public class PurpurWorldConfig {
@@ -1354,6 +1354,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
@@ -28,7 +28,7 @@ index 022d9f52ce7203a4e06f2b14fc10cdacf22649f3..4f4d7769692b1dee23c74dfd34a6ef13
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1381,6 +1382,7 @@ public class PurpurWorldConfig {
@@ -1376,6 +1377,7 @@ public class PurpurWorldConfig {
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);

2
patches/server/0199-Add-compass-command.patch → patches/server/0198-Add-compass-command.patch
View File

@@ -89,7 +89,7 @@ index 714acff3f53ef463d1de1d5f301b9a2f89711acc..351fc72f0d1450114285b0577e8d5e53
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 18cc6560ced4147ad845d871be312688b5d53cdd..38ca8ef2266fad79e5c70661404a4f1ec9ef60e0 100644
index 2811a4bff8a29d5975528d572320fb34e726b032..daeed4659b16d6aa30e91776189f9989f71bff11 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -224,6 +224,7 @@ public class PurpurWorldConfig {

4
patches/server/0200-Toggle-for-kinetic-damage.patch → patches/server/0199-Toggle-for-kinetic-damage.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for kinetic damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 75e994b0da981190083c8cda27a253116221aadb..7a35d45f8449a8399cb417357f0f0a6419bfbe3a 100644
index d4cdb88ca3247f3f9ea8f6797cc3b6ce0c7b5152..48fa05e80483e470572ecc8b2f7feb58e2f36dd0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2875,6 +2875,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -17,7 +17,7 @@ index 75e994b0da981190083c8cda27a253116221aadb..7a35d45f8449a8399cb417357f0f0a64
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3d7399d0cc16f3c3d799de473e013d4c24ee32ef..e2cd5a174ff4949decd03780a3a337808dc630dc 100644
index daeed4659b16d6aa30e91776189f9989f71bff11..53f5a3496d09aaadb3ba7abc3e93f7206c3c060c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -184,12 +184,14 @@ public class PurpurWorldConfig {

2
patches/server/0201-Add-Option-for-disable-observer-clocks.patch → patches/server/0200-Add-Option-for-disable-observer-clocks.patch
View File

@@ -18,7 +18,7 @@ index 7b45d6b9a005036ca5051d089a7be792eb87012f..8806c97ecc6bdd8a64c2d82bb2f58f46
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e2cd5a174ff4949decd03780a3a337808dc630dc..c3009eea0137f90eff1defcd93720c2aadc91047 100644
index 53f5a3496d09aaadb3ba7abc3e93f7206c3c060c..f08d302c7f8d163869067a80f5033e61b5cf3e40 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -371,6 +371,11 @@ public class PurpurWorldConfig {

6
patches/server/0202-Customizeable-Zombie-Villager-curing-times.patch → patches/server/0201-Customizeable-Zombie-Villager-curing-times.patch
View File

@@ -18,10 +18,10 @@ index c3f220a85b91a25662c943b5ee4508cd7a18c75d..40b3498c57c62f8bdaac50546ca47f49
return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 275c7d60d919949453683c6594472c6361ece4f5..555c8d554f0ec370336c4035e5a443ca7343612b 100644
index f08d302c7f8d163869067a80f5033e61b5cf3e40..1956541b29e264d9dc0cfda5569d708a2df83378 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2760,6 +2760,8 @@ public class PurpurWorldConfig {
@@ -2755,6 +2755,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index 275c7d60d919949453683c6594472c6361ece4f5..555c8d554f0ec370336c4035e5a443ca
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2775,6 +2777,8 @@ public class PurpurWorldConfig {
@@ -2770,6 +2772,8 @@ public class PurpurWorldConfig {
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);

4
patches/server/0203-Option-for-sponges-to-work-on-lava.patch → patches/server/0202-Option-for-sponges-to-work-on-lava.patch
View File

@@ -18,10 +18,10 @@ index e4e926dc89f843886d0df5da31e00053284f5dae..5964949a6048194476e6dd501503caf0
// NOP
} else if (iblockdata.getBlock() instanceof LiquidBlock) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3a9691cdd5e1d80ac551743f3fcab02d39949a88..d311fb97d7aeba0692827aadce4661c444ccc517 100644
index 1956541b29e264d9dc0cfda5569d708a2df83378..adb662181b627e7cd5aa34fc2947afd8c32a5ba6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -936,9 +936,11 @@ public class PurpurWorldConfig {
@@ -931,9 +931,11 @@ public class PurpurWorldConfig {
public int spongeAbsorptionArea = 64;
public int spongeAbsorptionRadius = 6;

6
patches/server/0204-Toggle-for-Wither-s-spawn-sound.patch → patches/server/0203-Toggle-for-Wither-s-spawn-sound.patch
View File

@@ -18,10 +18,10 @@ index 24fc4934f2193806fa38c8c3b0ad4cbfc53650a6..bd38dad0a38a60a0421ee62e52ef7009
// this.level().globalLevelEvent(1023, new BlockPosition(this), 0);
int viewDistance = ((ServerLevel) this.level()).getCraftServer().getViewDistance() * 16;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2e3200a9f6907161d8cf6fbac391ee0b42004bdf..9b337acfc4fe43e7ba795a0103ce49659f0420cb 100644
index adb662181b627e7cd5aa34fc2947afd8c32a5ba6..96871b1bbf2f7760da0d6a7426664af183ccbf04 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2605,6 +2605,7 @@ public class PurpurWorldConfig {
@@ -2600,6 +2600,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 2e3200a9f6907161d8cf6fbac391ee0b42004bdf..9b337acfc4fe43e7ba795a0103ce4965
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2626,6 +2627,7 @@ public class PurpurWorldConfig {
@@ -2621,6 +2622,7 @@ public class PurpurWorldConfig {
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);

6
patches/server/0205-Cactus-breaks-from-solid-neighbors-config.patch → patches/server/0204-Cactus-breaks-from-solid-neighbors-config.patch
View File

@@ -18,11 +18,11 @@ index 0003fb51ae3a6575575e10b4c86719f3061e2577..c2ca3432a47124d02e1aaf8ffb621f9a
return false;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 42183ead1b420821923f4bc540098d2011bcdb39..ef6450e446ac3a780af135ddcbf303ea790cc7d4 100644
index 96871b1bbf2f7760da0d6a7426664af183ccbf04..b9e362088aacba6b8475ddfac94d184313ed989a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -762,6 +762,11 @@ public class PurpurWorldConfig {
buddingAmethystSilkTouch = getBoolean("blocks.budding_amethyst.silk-touch", buddingAmethystSilkTouch);
@@ -757,6 +757,11 @@ public class PurpurWorldConfig {
});
}
+ public boolean cactusBreaksFromSolidNeighbors = true;

2
patches/server/0206-Config-to-remove-curse-of-binding-with-weakness.patch → patches/server/0205-Config-to-remove-curse-of-binding-with-weakness.patch
View File

@@ -26,7 +26,7 @@ index c549618421c5d077c3d977d8d2064eca2acc438a..5972fa434847d24fa98b7895fd8386d2
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ef6450e446ac3a780af135ddcbf303ea790cc7d4..8d8a4666b98e91d31976e72e261ee33886004520 100644
index b9e362088aacba6b8475ddfac94d184313ed989a..fad6f824b761ad41b462ed741e5476856638d0c8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -410,6 +410,7 @@ public class PurpurWorldConfig {

5
patches/server/0207-Conduit-behavior-configuration.patch → patches/server/0206-Conduit-behavior-configuration.patch
View File

@@ -77,10 +77,10 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
});
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e2c408e8675b097bf3075589ad5666b13a31edba..951fca41deaa997937a0488c3dbab6a1613d7fe7 100644
index fad6f824b761ad41b462ed741e5476856638d0c8..0806a8d8c2d067c3e534ec97948ae16de8628297 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2824,5 +2824,28 @@ public class PurpurWorldConfig {
@@ -2819,4 +2819,27 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
@@ -108,4 +108,3 @@ index e2c408e8675b097bf3075589ad5666b13a31edba..951fca41deaa997937a0488c3dbab6a1
+ conduitBlocks = conduitBlockList.toArray(Block[]::new);
+ }
}

5
patches/server/0208-Cauldron-fill-chances.patch → patches/server/0207-Cauldron-fill-chances.patch
View File

@@ -47,10 +47,10 @@ index e978132e51cde52f7ff1ba31ad521fc2cb4f0dce..60a95c42a333d68d9fd14539e0051c08
if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 951fca41deaa997937a0488c3dbab6a1613d7fe7..6416a9da03aabccdb358d00934cdc13e9fcf37b0 100644
index 0806a8d8c2d067c3e534ec97948ae16de8628297..e9be1c59292882b5a5239e305fb1a3ad008d9b81 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2847,5 +2847,16 @@ public class PurpurWorldConfig {
@@ -2842,4 +2842,15 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}
@@ -66,4 +66,3 @@ index 951fca41deaa997937a0488c3dbab6a1613d7fe7..6416a9da03aabccdb358d00934cdc13e
+ cauldronDripstoneLavaFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-lava", cauldronDripstoneLavaFillChance);
+ }
}

2
patches/server/0209-Config-to-allow-mobs-to-pathfind-over-rails.patch → patches/server/0208-Config-to-allow-mobs-to-pathfind-over-rails.patch
View File

@@ -18,7 +18,7 @@ index 3583fcf5284bc5883308876dbd9886664b391e28..d976a6df54c1e817def2d588692abe25
if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) {
double g = (double)(x - direction.getStepX()) + 0.5D;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1025ade27a3a7302e69001ce482b593b9f07c010..eae27b1dea745b400cfe99e96ae02bed9d3dd580 100644
index e9be1c59292882b5a5239e305fb1a3ad008d9b81..ce0e0e10eb677facd729d45c1c4f39a1fe92b72f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -140,6 +140,7 @@ public class PurpurWorldConfig {

6
patches/server/0210-Shulker-change-color-with-dye.patch → patches/server/0209-Shulker-change-color-with-dye.patch
View File

@@ -47,10 +47,10 @@ index 48fcfef45ab149328573f4e80c8f0289f9eebbe8..fbafb9e2ea9dfd237560d34f9cd6f295
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d5370c0912ed14f7a9ba030f28358c664a86dbf5..c61e98ca29066a3f70a69af4bd1ae03cab8d2478 100644
index ce0e0e10eb677facd729d45c1c4f39a1fe92b72f..31892e1ddcdb59580a1588219bc85757f3a926ea 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2167,6 +2167,7 @@ public class PurpurWorldConfig {
@@ -2162,6 +2162,7 @@ public class PurpurWorldConfig {
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
@@ -58,7 +58,7 @@ index d5370c0912ed14f7a9ba030f28358c664a86dbf5..c61e98ca29066a3f70a69af4bd1ae03c
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2183,6 +2184,7 @@ public class PurpurWorldConfig {
@@ -2178,6 +2179,7 @@ public class PurpurWorldConfig {
shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);

0
patches/server/0211-Extended-OfflinePlayer-API.patch → patches/server/0210-Extended-OfflinePlayer-API.patch
View File

2
patches/server/0212-Added-the-ability-to-add-combustible-items.patch → patches/server/0211-Added-the-ability-to-add-combustible-items.patch
View File

@@ -51,7 +51,7 @@ index ca2052804ad829a1528a9c5a0a792275beead113..997d0fab71eacc6466ffe3bc8f6349e5
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3f5ed031272c358f19e7ec3d7bf6d1a527d77f25..3ef465b4ff9f3a602f8c289e65e5a9548846cbcd 100644
index 7afc14b00a38bd83f5ec6dc12bf86bc7ee6574a2..00fe4b406eaec3e1bc02cb9bb35530d9c98743b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1447,6 +1447,19 @@ public final class CraftServer implements Server {

2
patches/server/0213-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch → patches/server/0212-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
View File

@@ -25,7 +25,7 @@ index 2a857449a95fab2738d16f7c9e1488d58c645e9b..a3841f5aa7dfc2176f64d8be6c453d2a
// CraftBukkit start
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b7cb860fde71c5be95b1c758ddbb0bd32350baa0..c12fc8aadb72cec739de6a952a960363e7b99b63 100644
index 31892e1ddcdb59580a1588219bc85757f3a926ea..2cfef0036198d3c0716a97c8def74f6a82e98abb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -141,6 +141,8 @@ public class PurpurWorldConfig {

4
patches/server/0214-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch → patches/server/0213-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
View File

@@ -45,7 +45,7 @@ index 0453397c157c8c7968947445f41bc46b68b111e8..ed35878fdb9dffcd46c27d26ee837940
public static final Block PINK_PETALS = register("pink_petals", new PinkPetalsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.PINK_PETALS).pushReaction(PushReaction.DESTROY)));
public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS).pushReaction(PushReaction.DESTROY)));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 22fee7a93b8b6c9ce064e386016f671d88f0ee14..57e2897e96e26ae5abef4d1d10373ea1ddb499b9 100644
index 2cfef0036198d3c0716a97c8def74f6a82e98abb..b1a41951a7822fc78cece7bb0863e5d69e0c9473 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -717,6 +717,11 @@ public class PurpurWorldConfig {
@@ -60,7 +60,7 @@ index 22fee7a93b8b6c9ce064e386016f671d88f0ee14..57e2897e96e26ae5abef4d1d10373ea1
public int beaconLevelOne = 20;
public int beaconLevelTwo = 30;
public int beaconLevelThree = 40;
@@ -859,6 +864,11 @@ public class PurpurWorldConfig {
@@ -854,6 +859,11 @@ public class PurpurWorldConfig {
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
}

2
patches/server/0215-Shift-right-click-to-use-exp-for-mending.patch → patches/server/0214-Shift-right-click-to-use-exp-for-mending.patch
View File

@@ -48,7 +48,7 @@ index 9b59fc923c85af6daf07d7bcf0d30ad39bd0cd8e..c4d8ca22639f8ad5c4375927f8ce7afa
cancelled = event.useItemInHand() == Event.Result.DENY;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2ad272de2bf20a2fbb5ec847e45ed5093285d35f..a8544e65700025cd326fe62edbaf7558432165ec 100644
index b1a41951a7822fc78cece7bb0863e5d69e0c9473..6406b1cd67ebd2d173a12a90ccc5dbbd388a4fb8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -417,6 +417,7 @@ public class PurpurWorldConfig {

6
patches/server/0216-Dolphins-naturally-aggressive-to-players-chance.patch → patches/server/0215-Dolphins-naturally-aggressive-to-players-chance.patch
View File

@@ -48,10 +48,10 @@ index 6006b9c996a8070336c4471f2a915d70c6371c76..3755ffc395ec4644a2263c59cdacfdba
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2062901fd6deadd8cc5daa62572e49a651a6b524..70acca2c55d406d50ce4925dc2bb6da4aed0ae8a 100644
index 6406b1cd67ebd2d173a12a90ccc5dbbd388a4fb8..39e0f27bd90e2518385f62b3347e7699e8d948f1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1265,6 +1265,7 @@ public class PurpurWorldConfig {
@@ -1260,6 +1260,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
@@ -59,7 +59,7 @@ index 2062901fd6deadd8cc5daa62572e49a651a6b524..70acca2c55d406d50ce4925dc2bb6da4
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1279,6 +1280,7 @@ public class PurpurWorldConfig {
@@ -1274,6 +1275,7 @@ public class PurpurWorldConfig {
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);

6
patches/server/0217-Cows-naturally-aggressive-to-players-chance.patch → patches/server/0216-Cows-naturally-aggressive-to-players-chance.patch
View File

@@ -57,10 +57,10 @@ index c6e5278641fb4a246a8df988fdf5068a044e2c4e..30e87b71ad237d76ec5adb4976edeca9
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 70acca2c55d406d50ce4925dc2bb6da4aed0ae8a..80865dc6f91fa07502816d4df3e6f3a801a96269 100644
index 39e0f27bd90e2518385f62b3347e7699e8d948f1..95e15e3a3e2915fa7b62079a9da137f08ba42231 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1214,7 +1214,14 @@ public class PurpurWorldConfig {
@@ -1209,7 +1209,14 @@ public class PurpurWorldConfig {
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
public boolean cowTakeDamageFromWater = false;
@@ -75,7 +75,7 @@ index 70acca2c55d406d50ce4925dc2bb6da4aed0ae8a..80865dc6f91fa07502816d4df3e6f3a8
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
@@ -1227,6 +1234,8 @@ public class PurpurWorldConfig {
@@ -1222,6 +1229,8 @@ public class PurpurWorldConfig {
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);

2
patches/server/0218-Option-for-beds-to-explode-on-villager-sleep.patch → patches/server/0217-Option-for-beds-to-explode-on-villager-sleep.patch
View File

@@ -22,7 +22,7 @@ index d78240487b934921509a26b7fca0bce0aaaa40b8..e862035b5e2cc8005a4e98779ee40e3a
this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level().getGameTime()); // CraftBukkit - decompile error
this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f9f88452e3907add31568a7665e0bf8710c4fa14..73335990e53945d5776360585a7a5c8239284c4b 100644
index 95e15e3a3e2915fa7b62079a9da137f08ba42231..a22f1730b956c8effd9594758ce66aa63230b822 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -736,6 +736,7 @@ public class PurpurWorldConfig {

4
patches/server/0219-Halloween-options-and-optimizations.patch → patches/server/0218-Halloween-options-and-optimizations.patch
View File

@@ -60,10 +60,10 @@ index 0bc90b6d5c5a3cb3477d41336a9bb1130ff32fa1..a8d2f8654ee370e98bb1c4e7e1111deb
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ffef86a59b422293c589e322d720d9d7f9f94102..845f8ae49a8d551b4231224478f45ee9c22df6f2 100644
index a22f1730b956c8effd9594758ce66aa63230b822..07166097088ba602a7e34ead2815656f95ba8171 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1607,6 +1607,13 @@ public class PurpurWorldConfig {
@@ -1602,6 +1602,13 @@ public class PurpurWorldConfig {
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
}

0
patches/server/0220-Config-for-grindstones.patch → patches/server/0219-Config-for-grindstones.patch
View File

0
patches/server/0221-UPnP-Port-Forwarding.patch → patches/server/0220-UPnP-Port-Forwarding.patch
View File

4
patches/server/0222-Campfire-option-for-lit-when-placed.patch → patches/server/0221-Campfire-option-for-lit-when-placed.patch
View File

@@ -18,10 +18,10 @@ index 219c87dcf065e86512f330fbeec59e55f4675083..f8fd3b320494d1c1e8ee3d170f2feebd
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 468c3ef2b414816bd3364b84599d824c965b3407..3d2e5b3c4a71f4ca1367f603851d7c51bd6d4e7e 100644
index 07166097088ba602a7e34ead2815656f95ba8171..a79b12f54bea4911b38147464939ce9197edccf5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -784,6 +784,11 @@ public class PurpurWorldConfig {
@@ -779,6 +779,11 @@ public class PurpurWorldConfig {
cactusBreaksFromSolidNeighbors = getBoolean("blocks.cactus.breaks-from-solid-neighbors", cactusBreaksFromSolidNeighbors);
}

2
patches/server/0223-options-to-extinguish-fire-blocks-with-snowballs.patch → patches/server/0222-options-to-extinguish-fire-blocks-with-snowballs.patch
View File

@@ -46,7 +46,7 @@ index b90cedad282e95a067aca176fafa9f72a726f520..9a8a1e773f247f4c4af4e9789deb70cd
protected void onHit(HitResult hitResult) {
super.onHit(hitResult);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3d2e5b3c4a71f4ca1367f603851d7c51bd6d4e7e..6f1e3e75963c98bc632eca8a3a2a6a01ca73b032 100644
index a79b12f54bea4911b38147464939ce9197edccf5..c79b825fc014472573a2c3161fd1877f5390444f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -233,6 +233,9 @@ public class PurpurWorldConfig {

6
patches/server/0224-Add-option-to-disable-zombie-villagers-cure.patch → patches/server/0223-Add-option-to-disable-zombie-villagers-cure.patch
View File

@@ -18,10 +18,10 @@ index 40b3498c57c62f8bdaac50546ca47f4927db7bfa..b8e0ae0714fd2b77831fb714b1bad901
itemstack.shrink(1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e59b76615211d50c497bca0708cdafbfc617127c..f00659487ee6f4106735df9e61832686be9802b6 100644
index c79b825fc014472573a2c3161fd1877f5390444f..d1a9e2d8b6f17c610d98a7c68d58dabd78facc70 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2824,6 +2824,7 @@ public class PurpurWorldConfig {
@@ -2819,6 +2819,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerTakeDamageFromWater = false;
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index e59b76615211d50c497bca0708cdafbfc617127c..f00659487ee6f4106735df9e61832686
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2841,6 +2842,7 @@ public class PurpurWorldConfig {
@@ -2836,6 +2837,7 @@ public class PurpurWorldConfig {
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);

2
patches/server/0225-Persistent-BlockEntity-Lore-and-DisplayName.patch → patches/server/0224-Persistent-BlockEntity-Lore-and-DisplayName.patch
View File

@@ -195,7 +195,7 @@ index 370a25d2deb54f10a35ee24d9e7e92fbfde60edf..2f19f6ac5de454845f5d13a3ebb93af6
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 70fc3bb9fcfb27b1cb7e8df2597fecbf9d1116ae..336d57ca9db99bc8df69d37b1002cc35c7ae21c4 100644
index d1a9e2d8b6f17c610d98a7c68d58dabd78facc70..a4642b8a922a664df3535874a23c1f6f357f1fe7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -132,6 +132,7 @@ public class PurpurWorldConfig {

6
patches/server/0226-Signs-allow-color-codes.patch → patches/server/0225-Signs-allow-color-codes.patch
View File

@@ -17,7 +17,7 @@ index 68d9ba56c15ce68edd773d2309eca428dadffe83..a155e61a95c0fe4fc16d6d18a02a83b6
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), front));
}
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
index 80695b2698d2904cec2c54ebe0ef880d95ed9583..c884b119fd956c3543864f06c1b1cd60cbd0eb88 100644
index ba6f0ba00cd2635bcd19889dca0349b363b079fe..86fc8079faa4b110387e98c100d423485aae0ea0 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
@@ -203,11 +203,18 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
@@ -67,10 +67,10 @@ 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 336d57ca9db99bc8df69d37b1002cc35c7ae21c4..5aa2acfba5e4f1154c66e7950c34354c6e4b04d5 100644
index a4642b8a922a664df3535874a23c1f6f357f1fe7..cfe5b900d20e2060b3d6633b406f2ea290ba0e66 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -964,6 +964,11 @@ public class PurpurWorldConfig {
@@ -959,6 +959,11 @@ public class PurpurWorldConfig {
shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
}

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

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

File diff suppressed because it is too large Load Diff

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

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

2
patches/server/0231-Ability-for-hoe-to-replant-crops-and-nether-warts.patch → patches/server/0230-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
View File

@@ -74,7 +74,7 @@ index e55720c4d2fbdf6aae526910e87a67c29cf906fd..0e4026e9d39735b840f12e59f84469b9
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 07faa306549156f83ab099745c4e07b327783885..ab91dfb2e55002d69422231ac5628f88c2f712c6 100644
index ae989cb0a749b70163a2de680c897c0a98a74087..ed178813ce4a467be74cc3d146c0782445ca551a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -563,6 +563,8 @@ public class PurpurWorldConfig {

6
patches/server/0232-Shearing-jeb-produces-random-color-wool.patch → patches/server/0231-Shearing-jeb-produces-random-color-wool.patch
View File

@@ -18,10 +18,10 @@ index a1b323ecba25910e97f154e487acc94943117e0c..62d8ae4c689170420c7850fbbb402be8
if (entityitem != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8071da9b2bc3e7c5e3ae061755648b023283b6eb..4127e830c91b5aa830d38ca8978411b04868617a 100644
index ed178813ce4a467be74cc3d146c0782445ca551a..569dba7fae83989f209f83c1f9da9bf64918139f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2291,6 +2291,7 @@ public class PurpurWorldConfig {
@@ -2286,6 +2286,7 @@ public class PurpurWorldConfig {
public boolean sheepBypassMobGriefing = false;
public boolean sheepTakeDamageFromWater = false;
public boolean sheepAlwaysDropExp = false;
@@ -29,7 +29,7 @@ index 8071da9b2bc3e7c5e3ae061755648b023283b6eb..4127e830c91b5aa830d38ca8978411b0
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -2305,6 +2306,7 @@ public class PurpurWorldConfig {
@@ -2300,6 +2301,7 @@ public class PurpurWorldConfig {
sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater);
sheepAlwaysDropExp = getBoolean("mobs.sheep.always-drop-exp", sheepAlwaysDropExp);

4
patches/server/0233-Turtle-eggs-random-tick-crack-chance.patch → patches/server/0232-Turtle-eggs-random-tick-crack-chance.patch
View File

@@ -18,10 +18,10 @@ index 7495e0e8beedad59fff24ebf189b58b307f7d796..70997b83fd7631ebf3c5bda67ef77bef
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 33a6e9c584c33d42364c25d76efb3fb478053121..f6ff629afaa70fd4a1f689fc92ca061887e5be87 100644
index 569dba7fae83989f209f83c1f9da9bf64918139f..2f139bc7a088e721e2da2823f163faa07ba5153b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -996,11 +996,13 @@ public class PurpurWorldConfig {
@@ -991,11 +991,13 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;

18
patches/server/0234-Mob-head-visibility-percent.patch → patches/server/0233-Mob-head-visibility-percent.patch
View File

@@ -32,10 +32,10 @@ index 48fa05e80483e470572ecc8b2f7feb58e2f36dd0..fd276495ddcf160660a725c721d3c3f1
// 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 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a450d51ae 100644
index 2f139bc7a088e721e2da2823f163faa07ba5153b..e4b6a301db66dd27a8d1cb275cb792043bc59e46 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1293,6 +1293,7 @@ public class PurpurWorldConfig {
@@ -1288,6 +1288,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1310,6 +1311,7 @@ public class PurpurWorldConfig {
@@ -1305,6 +1306,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);
@@ -51,7 +51,7 @@ index 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a
}
public boolean dolphinRidable = false;
@@ -2096,6 +2098,7 @@ public class PurpurWorldConfig {
@@ -2091,6 +2093,7 @@ public class PurpurWorldConfig {
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -2110,6 +2113,7 @@ public class PurpurWorldConfig {
@@ -2105,6 +2108,7 @@ public class PurpurWorldConfig {
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a
}
public boolean piglinBruteRidable = false;
@@ -2371,6 +2375,7 @@ public class PurpurWorldConfig {
@@ -2366,6 +2370,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -75,7 +75,7 @@ index 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2383,6 +2388,7 @@ public class PurpurWorldConfig {
@@ -2378,6 +2383,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);
@@ -83,7 +83,7 @@ index 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a
}
public boolean skeletonHorseRidableInWater = true;
@@ -2917,6 +2923,7 @@ public class PurpurWorldConfig {
@@ -2912,6 +2918,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -91,7 +91,7 @@ index 86c94849b066d83a48957f74eba1e83842784b8f..40d30a9fe7b4823945feb342c40e005a
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2935,6 +2942,7 @@ public class PurpurWorldConfig {
@@ -2930,6 +2937,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);

0
patches/server/0235-Configurable-valid-characters-for-usernames.patch → patches/server/0234-Configurable-valid-characters-for-usernames.patch
View File

0
patches/server/0236-Shears-can-have-looting-enchantment.patch → patches/server/0235-Shears-can-have-looting-enchantment.patch
View File

6
patches/server/0237-Stop-bees-from-dying-after-stinging.patch → patches/server/0236-Stop-bees-from-dying-after-stinging.patch
View File

@@ -17,10 +17,10 @@ index fad2da0ba194d349de73777a7ab43bb6447298e7..2afe5a4f3abaa3f9883b13fa3895e1e1
++this.timeSinceSting;
if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 953c796e72650c300f6d9f591fd167c2449a6482..bea8afb59dc0531a8989fe498740d5f7fd1e7c5d 100644
index e4b6a301db66dd27a8d1cb275cb792043bc59e46..cfa93e40311b3abdbd0dd6b88158e333289692d9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1091,6 +1091,7 @@ public class PurpurWorldConfig {
@@ -1086,6 +1086,7 @@ public class PurpurWorldConfig {
public boolean beeCanWorkAtNight = false;
public boolean beeCanWorkInRain = false;
public boolean beeAlwaysDropExp = false;
@@ -28,7 +28,7 @@ index 953c796e72650c300f6d9f591fd167c2449a6482..bea8afb59dc0531a8989fe498740d5f7
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -1107,6 +1108,7 @@ public class PurpurWorldConfig {
@@ -1102,6 +1103,7 @@ public class PurpurWorldConfig {
beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
beeAlwaysDropExp = getBoolean("mobs.bee.always-drop-exp", beeAlwaysDropExp);

0
patches/server/0238-Give-bee-counts-in-beehives-to-Purpur-clients.patch → patches/server/0237-Give-bee-counts-in-beehives-to-Purpur-clients.patch
View File

6
patches/server/0239-Configurable-farmland-trample-height.patch → patches/server/0238-Configurable-farmland-trample-height.patch
View File

@@ -35,10 +35,10 @@ index 1064a13f37b991e60213b052e252a183b8340449..2b1bd583d9c7f049bfb798aa38ef021a
org.bukkit.event.Cancellable cancellable;
if (entity instanceof Player) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 45abfce546fafc1e1c375ee55c99f8360cf934ab..a64f33a9dd1710fb95dc17c98e5b70e5ceef792b 100644
index cfa93e40311b3abdbd0dd6b88158e333289692d9..5f7acfeabef8176e834318c614c8c70a69816714 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -876,6 +876,7 @@ public class PurpurWorldConfig {
@@ -871,6 +871,7 @@ public class PurpurWorldConfig {
public boolean farmlandTramplingDisabled = false;
public boolean farmlandTramplingOnlyPlayers = false;
public boolean farmlandTramplingFeatherFalling = false;
@@ -46,7 +46,7 @@ index 45abfce546fafc1e1c375ee55c99f8360cf934ab..a64f33a9dd1710fb95dc17c98e5b70e5
private void farmlandSettings() {
farmlandBypassMobGriefing = getBoolean("blocks.farmland.bypass-mob-griefing", farmlandBypassMobGriefing);
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
@@ -883,6 +884,7 @@ public class PurpurWorldConfig {
@@ -878,6 +879,7 @@ public class PurpurWorldConfig {
farmlandTramplingDisabled = getBoolean("blocks.farmland.disable-trampling", farmlandTramplingDisabled);
farmlandTramplingOnlyPlayers = getBoolean("blocks.farmland.only-players-trample", farmlandTramplingOnlyPlayers);
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);

2
patches/server/0240-Configurable-player-pickup-exp-delay.patch → patches/server/0239-Configurable-player-pickup-exp-delay.patch
View File

@@ -35,7 +35,7 @@ index 0a9d8b22c7127b87826d9d256a5f36c34f2bfc0f..d00035e31cf4773a418d1cc6a6018d08
} else if (!entity.isRemoved()) {
this.touch(entity);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d53a4fef85b4b0e43db8b655604cfc6c08e7c6d6..01b862bf567649a80efa487c9fdcea9436f884f8 100644
index 5f7acfeabef8176e834318c614c8c70a69816714..35c040de3d27630727eb0f13418ac55f5c8e8990 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -426,6 +426,7 @@ public class PurpurWorldConfig {

2
patches/server/0241-Allow-void-trading.patch → patches/server/0240-Allow-void-trading.patch
View File

@@ -18,7 +18,7 @@ index a3841f5aa7dfc2176f64d8be6c453d2a4c8cf817..19df5bf9323eb10e22e87fcd29d94169
}
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 01b862bf567649a80efa487c9fdcea9436f884f8..e6f22da99c0f74c8d880ec76d7370c37c8812882 100644
index 35c040de3d27630727eb0f13418ac55f5c8e8990..b0b6ea9960a03594bcea95ba1ca869bcea950140 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -427,6 +427,7 @@ public class PurpurWorldConfig {

0
patches/server/0242-Dont-eat-blocks-in-non-ticking-chunks.patch → patches/server/0241-Dont-eat-blocks-in-non-ticking-chunks.patch
View File

6
patches/server/0243-Configurable-phantom-size.patch → patches/server/0242-Configurable-phantom-size.patch
View File

@@ -22,10 +22,10 @@ index f71cbaabfff370f019f124203fb947ea7a817d95..17638b9d3340c86528a8ae597712c759
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 72ad8283244d5db4d2abe980f55b89619354cb40..0e066619c16f3f5e6ed4dee8faba7cb2930ff44a 100644
index b0b6ea9960a03594bcea95ba1ca869bcea950140..5ca739bd7ac0fb3054e779247ba9fa2ca94eaa74 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2036,6 +2036,8 @@ public class PurpurWorldConfig {
@@ -2031,6 +2031,8 @@ public class PurpurWorldConfig {
public boolean phantomFlamesOnSwoop = false;
public boolean phantomTakeDamageFromWater = false;
public boolean phantomAlwaysDropExp = false;
@@ -34,7 +34,7 @@ index 72ad8283244d5db4d2abe980f55b89619354cb40..0e066619c16f3f5e6ed4dee8faba7cb2
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -2072,6 +2074,13 @@ public class PurpurWorldConfig {
@@ -2067,6 +2069,13 @@ public class PurpurWorldConfig {
phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
phantomAlwaysDropExp = getBoolean("mobs.phantom.always-drop-exp", phantomAlwaysDropExp);

0
patches/server/0244-Configurable-food-attributes.patch → patches/server/0243-Configurable-food-attributes.patch
View File

0
patches/server/0245-Max-joins-per-second.patch → patches/server/0244-Max-joins-per-second.patch
View File

6
patches/server/0246-Configurable-minimum-demand-for-trades.patch → patches/server/0245-Configurable-minimum-demand-for-trades.patch
View File

@@ -40,10 +40,10 @@ index 28bdcb14cb5b458d3c990fcf343ef97f08e4f3c6..48167334162443365bb8a6d082a51b2c
public ItemStack assemble() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0e066619c16f3f5e6ed4dee8faba7cb2930ff44a..10c7556d3e20fbaf2a269712be477d5435f57595 100644
index 5ca739bd7ac0fb3054e779247ba9fa2ca94eaa74..01640f7d1848ce2e70dc2acb54bfb58fe37eceb4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2719,6 +2719,7 @@ public class PurpurWorldConfig {
@@ -2714,6 +2714,7 @@ public class PurpurWorldConfig {
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 0e066619c16f3f5e6ed4dee8faba7cb2930ff44a..10c7556d3e20fbaf2a269712be477d54
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2739,6 +2740,7 @@ public class PurpurWorldConfig {
@@ -2734,6 +2735,7 @@ public class PurpurWorldConfig {
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);

6
patches/server/0247-Lobotomize-stuck-villagers.patch → patches/server/0246-Lobotomize-stuck-villagers.patch
View File

@@ -105,10 +105,10 @@ index e986767316a717bdbdff7a9ccaaeba068ab2a6d8..4d0b37957eb02b5d48beb76295ebc7c4
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 10c7556d3e20fbaf2a269712be477d5435f57595..186a6f9223b859ab8ec4636ea0d8868424ef5bfc 100644
index 01640f7d1848ce2e70dc2acb54bfb58fe37eceb4..0e65b4c27901299711e85cdd6359e1821dbebf66 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2720,6 +2720,8 @@ public class PurpurWorldConfig {
@@ -2715,6 +2715,8 @@ public class PurpurWorldConfig {
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
public int villagerMinimumDemand = 0;
@@ -117,7 +117,7 @@ index 10c7556d3e20fbaf2a269712be477d5435f57595..186a6f9223b859ab8ec4636ea0d88684
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2741,6 +2743,17 @@ public class PurpurWorldConfig {
@@ -2736,6 +2738,17 @@ public class PurpurWorldConfig {
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand);

6
patches/server/0248-Option-for-villager-display-trade-item.patch → patches/server/0247-Option-for-villager-display-trade-item.patch
View File

@@ -17,10 +17,10 @@ index 050be72c815010bf3f4b72427e2052b00420e8ee..8a213205f57c8dcd2226d7194d74b1b1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 186a6f9223b859ab8ec4636ea0d8868424ef5bfc..4ccc6242ad185168707dc5007e68b3f486a4ba77 100644
index 0e65b4c27901299711e85cdd6359e1821dbebf66..069d28e17d85f1ac35999b02f79e4cef4d34a502 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2722,6 +2722,7 @@ public class PurpurWorldConfig {
@@ -2717,6 +2717,7 @@ public class PurpurWorldConfig {
public int villagerMinimumDemand = 0;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
@@ -28,7 +28,7 @@ index 186a6f9223b859ab8ec4636ea0d8868424ef5bfc..4ccc6242ad185168707dc5007e68b3f4
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2754,6 +2755,7 @@ public class PurpurWorldConfig {
@@ -2749,6 +2750,7 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);

4
patches/server/0249-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch → patches/server/0248-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
View File

@@ -17,10 +17,10 @@ index cd2ce5bcb8c30e4657cd0e340d80544c7e805905..c8c6fed3f93903bb5c6145930538d415
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9e7bc34f5015d5fee6e0d440cffb769fd4d8ccd0..48376dbdb6a83dc9b29be0cb80435c1762ca3b44 100644
index 069d28e17d85f1ac35999b02f79e4cef4d34a502..b1f3bc498678603e7a2e78708cb84cb351e373e4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -985,8 +985,10 @@ public class PurpurWorldConfig {
@@ -980,8 +980,10 @@ public class PurpurWorldConfig {
}
public boolean spawnerDeactivateByRedstone = false;

4
patches/server/0250-Config-for-mob-last-hurt-by-player-time.patch → patches/server/0249-Config-for-mob-last-hurt-by-player-time.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config for mob last hurt by player time
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 39ee6fbc6ce17b61abf88deba69b0adecb294417..b8fbc726f1f73a4c20ea7eeca2846c864b9e67bc 100644
index fd276495ddcf160660a725c721d3c3f1d6bdd72b..6e2412640d76c45158777136bc38cbe523440e69 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1504,13 +1504,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -38,7 +38,7 @@ index 641caa0f74a40ea52f71f3150c0168272b378edf..d5ed0e06c13f6df41b073a8b90992a20
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 48376dbdb6a83dc9b29be0cb80435c1762ca3b44..12a41aef32b0181d6109cf2324f066183c720ab2 100644
index b1f3bc498678603e7a2e78708cb84cb351e373e4..301b8c0217eb8f7bddfcc7e25832b2994628ac75 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -144,6 +144,7 @@ public class PurpurWorldConfig {

2
patches/server/0251-Anvil-repair-damage-options.patch → patches/server/0250-Anvil-repair-damage-options.patch
View File

@@ -64,7 +64,7 @@ index 5c5a3b169795bf8a527b316c666cbc2105c66622..020afeca950d2c7fb6c7b179d424548f
return InteractionResult.SUCCESS;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 12a41aef32b0181d6109cf2324f066183c720ab2..ef8b68c10b8b2e23c4e51457ec7c8650a0f15303 100644
index 301b8c0217eb8f7bddfcc7e25832b2994628ac75..39f0c7be1d0023178b34bc7699aa5c4445b02c13 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -732,9 +732,13 @@ public class PurpurWorldConfig {

0
patches/server/0252-Fix-legacy-colors-in-console.patch → patches/server/0251-Fix-legacy-colors-in-console.patch
View File

4
patches/server/0253-Option-to-disable-turtle-egg-trampling-with-feather-.patch → patches/server/0252-Option-to-disable-turtle-egg-trampling-with-feather-.patch
View File

@@ -24,10 +24,10 @@ index 70997b83fd7631ebf3c5bda67ef77bef605eb464..a8c227e2cb62cfa8225798329cde9078
return world.purpurConfig.turtleEggsBypassMobGriefing || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
// Purpur end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 35c28ca9fe127ce32583bb95da38af54bde5bc4f..e4786e4cf59354ab43d6afbfd0317936ea04e7e8 100644
index 39f0c7be1d0023178b34bc7699aa5c4445b02c13..c2deb96f15727460af72662b1ce4f81a58e9f3a6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1011,12 +1011,14 @@ public class PurpurWorldConfig {
@@ -1006,12 +1006,14 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;
public int turtleEggsRandomTickCrackChance = 500;

2
patches/server/0254-Add-toggle-for-enchant-level-clamping.patch → patches/server/0253-Add-toggle-for-enchant-level-clamping.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for enchant level clamping
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 3660b54ef390bf5629676bc14d819a78b645ef2e..ae19380c2e14f81f068a02744f64a99dc643eb51 100644
index f950ca76771a290307db728c7d35819fb37a21b5..10dbd8a58d20319a671b34d9e4a7ff5d8bce7c62 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1196,7 +1196,7 @@ public final class ItemStack {

0
patches/server/0255-Skip-junit-tests-for-purpur-commands.patch → patches/server/0254-Skip-junit-tests-for-purpur-commands.patch
View File

6
patches/server/0256-Implement-configurable-search-radius-for-villagers-t.patch → patches/server/0255-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -18,10 +18,10 @@ index 43afded0ddd88094971ace2dd02d2aca6c3e86ae..25bf930258065b6cc6d6c3a790835ddf
AABB axisalignedbb = this.getBoundingBox().inflate(10.0D, 10.0D, 10.0D);
List<Villager> list = world.getEntitiesOfClass(Villager.class, axisalignedbb);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a7aef390278897b9a0e3c4d6a86f1eebb2fde32c..501b4f9adf8233dcf2be6500be16818a9e83dad5 100644
index c2deb96f15727460af72662b1ce4f81a58e9f3a6..52ce83ffceb8480812fe6176d46b803e4324d455 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2733,6 +2733,8 @@ public class PurpurWorldConfig {
@@ -2728,6 +2728,8 @@ public class PurpurWorldConfig {
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
public boolean villagerDisplayTradeItem = true;
@@ -30,7 +30,7 @@ index a7aef390278897b9a0e3c4d6a86f1eebb2fde32c..501b4f9adf8233dcf2be6500be16818a
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2766,6 +2768,8 @@ public class PurpurWorldConfig {
@@ -2761,6 +2763,8 @@ public class PurpurWorldConfig {
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);

4
patches/server/0257-Stonecutter-damage.patch → patches/server/0256-Stonecutter-damage.patch
View File

@@ -63,10 +63,10 @@ index 3de2e7a17e1234367e4ec6d944b1145781aefeba..15ed564a579237dd1f5d6ce56ccb473f
public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3d45424694c11f54519dd31c3aa9465a491706f4..e6e5d494e1b1136bc45518628b36e43795582504 100644
index 52ce83ffceb8480812fe6176d46b803e4324d455..35c2c97b157cda8fd56e1778ea3d0ca6afb84e41 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1006,6 +1006,11 @@ public class PurpurWorldConfig {
@@ -1001,6 +1001,11 @@ public class PurpurWorldConfig {
spongeAbsorbsLava = getBoolean("blocks.sponge.absorbs-lava", spongeAbsorbsLava);
}

4
patches/server/0258-Configurable-damage-settings-for-magma-blocks.patch → patches/server/0257-Configurable-damage-settings-for-magma-blocks.patch
View File

@@ -18,10 +18,10 @@ index 1b766045687e4dcded5cbcc50b746c55b9a34e22..be365914856593bb3c4e1945cc990786
entity.hurt(world.damageSources().hotFloor(), 1.0F);
org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9e4160027df7ddd61b5d4766e45544dba0ae59d0..e4586bc34f3659dce18c1f3bd9c2ddf02d299564 100644
index 35c2c97b157cda8fd56e1778ea3d0ca6afb84e41..77e57af5c11c5100241cc81f2ffa06d4539a6ecd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -939,6 +939,13 @@ public class PurpurWorldConfig {
@@ -934,6 +934,13 @@ public class PurpurWorldConfig {
pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
}

4
patches/server/0259-Add-config-for-snow-on-blue-ice.patch → patches/server/0258-Add-config-for-snow-on-blue-ice.patch
View File

@@ -22,10 +22,10 @@ index 14e00c7feb1c051d56a3d27cd00dcef072dd771a..4952fb1aaaafb55baa0fddb389f966a1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e4586bc34f3659dce18c1f3bd9c2ddf02d299564..eb1ef5a02900172f7228bcd25cac9be3b586e50c 100644
index 77e57af5c11c5100241cc81f2ffa06d4539a6ecd..af6276c368f40bc2dcc7f194f46707bd96997bae 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -920,9 +920,11 @@ public class PurpurWorldConfig {
@@ -915,9 +915,11 @@ public class PurpurWorldConfig {
public boolean mobsSpawnOnPackedIce = true;
public boolean mobsSpawnOnBlueIce = true;

6
patches/server/0260-Skeletons-eat-wither-roses.patch → patches/server/0259-Skeletons-eat-wither-roses.patch
View File

@@ -94,10 +94,10 @@ index 9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86..f4a47ac2c86cc95178922cce7320ba1e
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c60ef8455e4d5f96253bfcdc672cad924541d3de..8ec3d1287fc845d4c2d7588c66be46d25f46a462 100644
index af6276c368f40bc2dcc7f194f46707bd96997bae..ad2b0a494ced3c73950a0c56511d7309ff311d5a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2417,6 +2417,7 @@ public class PurpurWorldConfig {
@@ -2412,6 +2412,7 @@ public class PurpurWorldConfig {
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
@@ -105,7 +105,7 @@ index c60ef8455e4d5f96253bfcdc672cad924541d3de..8ec3d1287fc845d4c2d7588c66be46d2
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2430,6 +2431,7 @@ public class PurpurWorldConfig {
@@ -2425,6 +2426,7 @@ public class PurpurWorldConfig {
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);

4
patches/server/0261-Enchantment-Table-Persists-Lapis.patch → patches/server/0260-Enchantment-Table-Persists-Lapis.patch
View File

@@ -146,10 +146,10 @@ index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..b7370e64fd0d50e8725d7d5afc30af2e
+ // Purpur
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8ec3d1287fc845d4c2d7588c66be46d25f46a462..c8e60d6fd8e52d27b127c91a00b169be9932abd6 100644
index ad2b0a494ced3c73950a0c56511d7309ff311d5a..a96d897079107cc8582ca908a20027a52aa2b326 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1452,6 +1452,11 @@ public class PurpurWorldConfig {
@@ -1447,6 +1447,11 @@ public class PurpurWorldConfig {
elderGuardianAlwaysDropExp = getBoolean("mobs.elder_guardian.always-drop-exp", elderGuardianAlwaysDropExp);
}

0
patches/server/0262-Spark-Profiler.patch → patches/server/0261-Spark-Profiler.patch
View File

0
patches/server/0263-Option-to-disable-kick-for-out-of-order-chat.patch → patches/server/0262-Option-to-disable-kick-for-out-of-order-chat.patch
View File

4
patches/server/0264-Config-for-sculk-shrieker-can_summon-state.patch → patches/server/0263-Config-for-sculk-shrieker-can_summon-state.patch
View File

@@ -18,10 +18,10 @@ index 02d01eabb9606ae8c3b76ad9fa4bb9a525e247b1..ce51fec4a874f9466f9966684c535315
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0996409b857de7cf3531290935bceca34159a2ef..d19754041ab8d82eff3971492faa7dd1523f475b 100644
index a96d897079107cc8582ca908a20027a52aa2b326..09deb7a2ad62e878c1b6ce7b315ec24cbd643807 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -984,6 +984,11 @@ public class PurpurWorldConfig {
@@ -979,6 +979,11 @@ public class PurpurWorldConfig {
fixSandDuping = getBoolean("blocks.sand.fix-duping", fixSandDuping);
}

4
patches/server/0265-Config-to-not-let-coral-die.patch → patches/server/0264-Config-to-not-let-coral-die.patch
View File

@@ -29,10 +29,10 @@ index 88faea00be60a519f56f975a5311df5e1eb3e6b8..cbb726ac367be81e27d3a86643baf7c4
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 d19754041ab8d82eff3971492faa7dd1523f475b..f7c21ff0da5e83b3e2c04df6478fbb5038e8e568 100644
index 09deb7a2ad62e878c1b6ce7b315ec24cbd643807..0474daca28a6449dbc7cb0b7562c0b6d55421e39 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -821,6 +821,11 @@ public class PurpurWorldConfig {
@@ -816,6 +816,11 @@ public class PurpurWorldConfig {
composterBulkProcess = getBoolean("blocks.composter.sneak-to-bulk-process", composterBulkProcess);
}

0
patches/server/0266-Add-local-difficulty-api.patch → patches/server/0265-Add-local-difficulty-api.patch
View File

2
patches/server/0267-Add-toggle-for-RNG-manipulation.patch → patches/server/0266-Add-toggle-for-RNG-manipulation.patch
View File

@@ -33,7 +33,7 @@ index beef2f6a42eebeaf5761bac841300f780bfdf4f2..41797940d89fec55cb7de4c63eb3ea5c
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9c0bbaf1573167bc558fedfe5656b225de4ff1a3..2544326898b5dcfe0d15a0ebaf0e3cfbea5572b8 100644
index 0474daca28a6449dbc7cb0b7562c0b6d55421e39..c703266f931ed02653f89b1aa943ec32a59826a0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -206,9 +206,11 @@ public class PurpurWorldConfig {

0
patches/server/0268-Send-client-custom-name-of-BE.patch → patches/server/0267-Send-client-custom-name-of-BE.patch
View File

2
patches/server/0269-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch → patches/server/0268-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch
View File

@@ -85,7 +85,7 @@ index 574ebb3a2fcd0e4e426a8a7ee88d722ed3b9c3f5..862972afa333422592a25b854cec191e
}
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index c6bd785382fcd0097c0cfc60ed9b5241cd1b2250..16e051084bb4e9efc3bd009b76f5cd88d62f4fa3 100644
index 10dbd8a58d20319a671b34d9e4a7ff5d8bce7c62..5e77294baace4c1e7f8f47bdb9ca362324511496 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -113,6 +113,7 @@ import org.bukkit.event.world.StructureGrowEvent;

0
patches/server/0270-Allow-custom-ChatDecorators.patch → patches/server/0269-Allow-custom-ChatDecorators.patch
View File

0
patches/server/0271-Cache-server-motd.patch → patches/server/0270-Cache-server-motd.patch
View File

0
patches/server/0272-Remove-Timings.patch → patches/server/0271-Remove-Timings.patch
View File

0
patches/server/0273-Remove-Mojang-Profiler.patch → patches/server/0272-Remove-Mojang-Profiler.patch
View File

2
patches/server/0274-Add-more-logger-output-for-invalid-movement-kicks.patch → patches/server/0273-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 eb62c04013d981390524beb74dc37bc2443b844c..bf9635072d4ffc298a5221309bdf329c67e0451a 100644
index e3ec7429e262658ca94db9b74f3fe39e927f93c1..ea27cb95743970b519b9ab3a3163ba2a7d098921 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/0275-Add-Bee-API.patch → patches/server/0274-Add-Bee-API.patch
View File

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

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

@@ -18,7 +18,7 @@ index 03fc9c6ef0fb320924038f2730c6f08426f0842c..029cceb339c86abe05d9eee944b60c08
if (entityhuman != null) {
double d2 = entityhuman.distanceToSqr(d0, (double) i, d1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2cf32b572bf9d737bbecf6777ec3db62dd9b0283..ded437b33e88b1cef1797e293e3278321a12e216 100644
index c703266f931ed02653f89b1aa943ec32a59826a0..ad18b96cae9bb6b1f9c68e3fd53ee728e36144a2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -379,6 +379,7 @@ public class PurpurWorldConfig {

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

@@ -18,10 +18,10 @@ index 41376b705748e14c1c4174e07732ce09ad8e581f..dd84433a988712da9d799cbda2487a90
org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper
if (event.isCancelled()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 30a18d6d555212e07209723f66dbee0c980ba343..c8ed7d81fed0f1513294efbc75fa6e3e9f317a5d 100644
index ad18b96cae9bb6b1f9c68e3fd53ee728e36144a2..60f8b4010a5b68f49da1b14f7c1a5111ae424578 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2437,6 +2437,8 @@ public class PurpurWorldConfig {
@@ -2432,6 +2432,8 @@ public class PurpurWorldConfig {
public boolean skeletonAlwaysDropExp = false;
public double skeletonHeadVisibilityPercent = 0.5D;
public int skeletonFeedWitherRoses = 0;
@@ -30,7 +30,7 @@ index 30a18d6d555212e07209723f66dbee0c980ba343..c8ed7d81fed0f1513294efbc75fa6e3e
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2451,6 +2453,18 @@ public class PurpurWorldConfig {
@@ -2446,6 +2448,18 @@ public class PurpurWorldConfig {
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);

4
patches/server/0279-Allay-respect-item-NBT.patch → patches/server/0278-Allay-respect-item-NBT.patch
View File

@@ -44,10 +44,10 @@ index 15c4531865d829ea90d060ee83122a80ab39028b..379d168eb4ba958622398efa79fa43d5
private boolean allayConsidersItemEqual(ItemStack stack, ItemStack stack2) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9c29305e24186a35999765784d46768d9b4459cf..c89c3855902f2e7f4c7b4c56a3dfab238e68f85f 100644
index 60f8b4010a5b68f49da1b14f7c1a5111ae424578..cecc0ad40a537eca5f08342c8609ffb5ddaef470 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1068,10 +1068,13 @@ public class PurpurWorldConfig {
@@ -1063,10 +1063,13 @@ public class PurpurWorldConfig {
public boolean allayRidable = false;
public boolean allayRidableInWater = true;
public boolean allayControllable = true;

0
patches/server/0280-Add-death-screen-API.patch → patches/server/0279-Add-death-screen-API.patch
View File

0
patches/server/0281-Implement-ram-and-rambar-commands.patch → patches/server/0280-Implement-ram-and-rambar-commands.patch
View File

0
patches/server/0282-Add-item-packet-serialize-event.patch → patches/server/0281-Add-item-packet-serialize-event.patch
View File

0
patches/server/0283-Fix-MC-123848.patch → patches/server/0282-Fix-MC-123848.patch
View File

6
patches/server/0284-Implement-squid-colors-for-rainglow-fabric-mod.patch → patches/server/0283-Implement-squid-colors-for-rainglow-fabric-mod.patch
View File

@@ -40,10 +40,10 @@ index 43cdda0cb26c5d5cc9025199eb71673d71c2abea..83660fad1e4c0ce5800f6e62f915ccd8
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 338b9434156157bb7d1641f2b5c91e757486e2bf..98b8c5b901feb5cc907456c6669a21f6ea0b1791 100644
index cecc0ad40a537eca5f08342c8609ffb5ddaef470..1e0336ade0d02005ffcc68326f386e65bd2f1700 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1689,6 +1689,7 @@ public class PurpurWorldConfig {
@@ -1684,6 +1684,7 @@ public class PurpurWorldConfig {
public boolean glowSquidsCanFly = false;
public boolean glowSquidTakeDamageFromWater = false;
public boolean glowSquidAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 338b9434156157bb7d1641f2b5c91e757486e2bf..98b8c5b901feb5cc907456c6669a21f6
private void glowSquidSettings() {
glowSquidRidable = getBoolean("mobs.glow_squid.ridable", glowSquidRidable);
glowSquidControllable = getBoolean("mobs.glow_squid.controllable", glowSquidControllable);
@@ -1696,6 +1697,7 @@ public class PurpurWorldConfig {
@@ -1691,6 +1692,7 @@ public class PurpurWorldConfig {
glowSquidsCanFly = getBoolean("mobs.glow_squid.can-fly", glowSquidsCanFly);
glowSquidTakeDamageFromWater = getBoolean("mobs.glow_squid.takes-damage-from-water", glowSquidTakeDamageFromWater);
glowSquidAlwaysDropExp = getBoolean("mobs.glow_squid.always-drop-exp", glowSquidAlwaysDropExp);

2
patches/server/0285-Add-an-option-to-fix-MC-3304-projectile-looting.patch → patches/server/0284-Add-an-option-to-fix-MC-3304-projectile-looting.patch
View File

@@ -48,7 +48,7 @@ index 220513d3fd5645322886522ea4f6b8c55d043b3c..d45a2f49c82d00801578c34e5f5277fc
org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityhuman, stack, itemstack1, entityarrow, entityhuman.getUsedItemHand(), f, !flag1);
if (event.isCancelled()) {
diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
index 1a2ce6fb16e8fed7c90ce99510b25531087a0699..5ddda49ca692b6397a8ce896baf449dc0c6183c1 100644
index 561e9acb90639031f19b5ff8685852599672f468..73275b38c08a5ab85538625510fd8aac59f9a092 100644
--- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
@@ -295,6 +295,14 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {

0
patches/server/0286-Configurable-block-blast-resistance.patch → patches/server/0285-Configurable-block-blast-resistance.patch
View File

0
patches/server/0287-Configurable-block-fall-damage-modifiers.patch → patches/server/0286-Configurable-block-fall-damage-modifiers.patch
View File

2
patches/server/0288-Language-API.patch → patches/server/0287-Language-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Language API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ce8179d33d5a6a187e16496731798e42488cb87a..b250de8151c07ec960de8b6c4aff9d0ea852773b 100644
index c1967a538812b871aa99ba34d83599d5fcf1601f..06ded97822e9a51bf6aea377e59013a0717664e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -324,6 +324,20 @@ public final class CraftServer implements Server {

4
patches/server/0289-Milk-Keeps-Beneficial-Effects.patch → patches/server/0288-Milk-Keeps-Beneficial-Effects.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3084ea26a9364a58a78a4f75df40aa509124ac44..809eea9e5418d613ff43024f14f84c7a90956e98 100644
index af5a747241966dd93b331f1d79e3a857a38ac86c..b534b786ca1209652d13a1c6a77c03a9282946a2 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1126,6 +1126,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -30,7 +30,7 @@ index 7fa248b2d1b73e20085f0d3cdfead38547e4e924..ecfb5d8b47c461ae661149f1c7b9bace
this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ff33ae3591a23386ba870a92e1260a827c8b2ee4..560491ac60ed89d2103b4b1baada5e032a33345b 100644
index 1e0336ade0d02005ffcc68326f386e65bd2f1700..3ffc72a4ad5e7c0a2c9a1ccaf23455613270328d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -130,6 +130,7 @@ public class PurpurWorldConfig {

0
patches/server/0290-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch → patches/server/0289-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
View File

0
patches/server/0291-Add-log-suppression-for-LibraryLoader.patch → patches/server/0290-Add-log-suppression-for-LibraryLoader.patch
View File

6
patches/server/0293-Add-option-to-allow-creeper-to-encircle-target-when-.patch → patches/server/0291-Add-option-to-allow-creeper-to-encircle-target-when-.patch
View File

@@ -24,10 +24,10 @@ index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..7b99c3446b50939241d3e220d93e0564
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index db583b03b2f986288468fa812c2e3e860cc4f371..58b1e0b55c21275ecd49bfb71317bc867652910e 100644
index 3ffc72a4ad5e7c0a2c9a1ccaf23455613270328d..41910eeaf38b4f6b31f7d6b4b2009063794bb80c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1345,6 +1345,7 @@ public class PurpurWorldConfig {
@@ -1340,6 +1340,7 @@ public class PurpurWorldConfig {
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
public double creeperHeadVisibilityPercent = 0.5D;
@@ -35,7 +35,7 @@ index db583b03b2f986288468fa812c2e3e860cc4f371..58b1e0b55c21275ecd49bfb71317bc86
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1363,6 +1364,7 @@ public class PurpurWorldConfig {
@@ -1358,6 +1359,7 @@ public class PurpurWorldConfig {
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
creeperHeadVisibilityPercent = getDouble("mobs.creeper.head-visibility-percent", creeperHeadVisibilityPercent);

41
patches/server/0292-Allow-Transparent-Blocks-In-Enchanting-Box.patch
View File

@@ -1,41 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rhythmic <mc.ADHDMC@gmail.com>
Date: Sat, 15 Oct 2022 13:32:15 -0700
Subject: [PATCH] Allow Transparent Blocks In Enchanting Box
diff --git a/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java b/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java
index 286f34eef22a85be3fe9747dc3c3f9a7d51f437c..ff2b97e4feff3eefe50d2715437a68a8b16281fc 100644
--- a/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java
@@ -43,6 +43,10 @@ public class EnchantmentTableBlock extends BaseEntityBlock {
}
public static boolean isValidBookShelf(Level world, BlockPos tablePos, BlockPos providerOffset) {
+ // Purpur Start
+ if(org.purpurmc.purpur.PurpurConfig.allowTransparentBlocksInEnchantmentBox){
+ return world.getBlockState(tablePos.offset(providerOffset)).is(BlockTags.ENCHANTMENT_POWER_PROVIDER) && !world.getBlockState(tablePos.offset(providerOffset.getX() / 2, providerOffset.getY(), providerOffset.getZ() / 2)).isSuffocating(world, providerOffset);
+ } // Purpur end
return world.getBlockState(tablePos.offset(providerOffset)).is(BlockTags.ENCHANTMENT_POWER_PROVIDER) && world.getBlockState(tablePos.offset(providerOffset.getX() / 2, providerOffset.getY(), providerOffset.getZ() / 2)).is(BlockTags.ENCHANTMENT_POWER_TRANSMITTER);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index c3878aed434bdf490cbaf45064fa5a6c5814476f..81409df1af15b68971b1efd203b9ad8d87ca7b6e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -415,6 +415,7 @@ public class PurpurConfig {
public static boolean allowInfinityMending = false;
public static boolean allowCrossbowInfinity = false;
public static boolean allowShearsLooting = false;
+ public static boolean allowTransparentBlocksInEnchantmentBox = false;
public static boolean allowUnsafeEnchants = false;
public static boolean allowInapplicableEnchants = true;
public static boolean allowIncompatibleEnchants = true;
@@ -438,6 +439,7 @@ public class PurpurConfig {
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
allowShearsLooting = getBoolean("settings.enchantment.allow-looting-on-shears", allowShearsLooting);
+ allowTransparentBlocksInEnchantmentBox = getBoolean("settings.enchantment.allow-transparent-blocks-in-enchantment-box", allowTransparentBlocksInEnchantmentBox);
allowUnsafeEnchants = getBoolean("settings.enchantment.anvil.allow-unsafe-enchants", allowUnsafeEnchants);
allowInapplicableEnchants = getBoolean("settings.enchantment.anvil.allow-inapplicable-enchants", allowInapplicableEnchants);
allowIncompatibleEnchants = getBoolean("settings.enchantment.anvil.allow-incompatible-enchants", allowIncompatibleEnchants);

0
patches/server/0294-Fire-Immunity-API.patch → patches/server/0292-Fire-Immunity-API.patch
View File

Some files were not shown because too many files have changed in this diff Show More