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

Add missing option for player cramming

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-03 10:28:04 -05:00
parent c69c0bcadf
commit b1a0ea61ab
110 changed files with 419 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0050-Players-should-not-cram-to-death.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 182b9e850be72b72636d03c4d303fb264ca875f6..c6e33f674543841710d351235a1a2b2223422a0d 100644
index 056b679cab7fe660d4a9b8bf782674fb210dd8bb..288d8e687f26c8f9757db055751dded6025117d5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1436,7 +1436,7 @@ public class ServerPlayer extends Player {
@@ -13,7 +13,27 @@ index 182b9e850be72b72636d03c4d303fb264ca875f6..c6e33f674543841710d351235a1a2b22
@Override
public boolean isInvulnerableTo(DamageSource damageSource) {
- return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER;
+ return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || damageSource == DamageSource.CRAMMING || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER; // Purpur
+ return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || (!level.purpurConfig.playersShouldCramToDeath && damageSource == DamageSource.CRAMMING) || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER; // Purpur
}
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index da2e7d146029d36472de7800c42fb5d72252da3a..f368541a5ee2cbfe61dbf76653d8461b98d234ef 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -163,6 +163,7 @@ public class PurpurWorldConfig {
public boolean idleTimeoutUpdateTabList = false;
public int playerSpawnInvulnerableTicks = 60;
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
+ public boolean playersShouldCramToDeath = true;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -170,6 +171,7 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
+ playersShouldCramToDeath = getBoolean("gameplay-mechanics.player.should-cram-to-death", playersShouldCramToDeath);
}
public boolean silkTouchEnabled = false;

4
patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -28,10 +28,10 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index da2e7d146029d36472de7800c42fb5d72252da3a..a692550385262523e71427b7eda3939e44ad0de5 100644
index f368541a5ee2cbfe61dbf76653d8461b98d234ef..16597faf7e846c96d09a5706a089325e6c3fca52 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -198,8 +198,10 @@ public class PurpurWorldConfig {
@@ -200,8 +200,10 @@ public class PurpurWorldConfig {
}
public boolean disableDropsOnCrammingDeath = false;

6
patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
View File

@@ -17,10 +17,10 @@ index 8212ee2cc1242c0a3626f3643c455f3be0de18c2..aaf6f43c0f37a51a7b2db57b8da43365
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a692550385262523e71427b7eda3939e44ad0de5..eac5609b34e73d3cbfa88b43b3544ca3ccd4cb48 100644
index 16597faf7e846c96d09a5706a089325e6c3fca52..7d8c916e5e25fa0b05490cffab464e7ebfc8f430 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1302,6 +1302,7 @@ public class PurpurWorldConfig {
@@ -1304,6 +1304,7 @@ public class PurpurWorldConfig {
public boolean witherSkeletonRidable = false;
public boolean witherSkeletonRidableInWater = false;
public double witherSkeletonMaxHealth = 20.0D;
@@ -28,7 +28,7 @@ index a692550385262523e71427b7eda3939e44ad0de5..eac5609b34e73d3cbfa88b43b3544ca3
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -1311,6 +1312,7 @@ public class PurpurWorldConfig {
@@ -1313,6 +1314,7 @@ public class PurpurWorldConfig {
set("mobs.wither_skeleton.attributes.max_health", oldValue);
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);

4
patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
View File

@@ -18,10 +18,10 @@ index c95eef8596fe3e1ca83e620a6c54b164c797cbe1..1e6a5404d767318de29184b3e3a2bc41
if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
this.spawnAtLocation(this.getPickupItem(), 0.1F);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index eac5609b34e73d3cbfa88b43b3544ca3ccd4cb48..3d6d92986ab14d85cab4c35040bad47ca3c01caa 100644
index 7d8c916e5e25fa0b05490cffab464e7ebfc8f430..902d0d4cad0527ac3fa171d5484e1679795d3c63 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -199,9 +199,11 @@ public class PurpurWorldConfig {
@@ -201,9 +201,11 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;

10
patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch
View File

@@ -38,10 +38,10 @@ index b061ecc42122ef66fbf87fe017023abca5728a01..6e0b5fbf5b0d216b6b7c647d45ef37cd
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3d6d92986ab14d85cab4c35040bad47ca3c01caa..307b955876e8b7517f68b1fd581fb2dd3e3edae0 100644
index 902d0d4cad0527ac3fa171d5484e1679795d3c63..67e133cc8f26d66c2282830d012117ef298ec43a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -371,6 +371,7 @@ public class PurpurWorldConfig {
@@ -373,6 +373,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index 3d6d92986ab14d85cab4c35040bad47ca3c01caa..307b955876e8b7517f68b1fd581fb2dd
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -381,6 +382,7 @@ public class PurpurWorldConfig {
@@ -383,6 +384,7 @@ public class PurpurWorldConfig {
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
@@ -57,7 +57,7 @@ index 3d6d92986ab14d85cab4c35040bad47ca3c01caa..307b955876e8b7517f68b1fd581fb2dd
}
public boolean dolphinRidable = false;
@@ -478,6 +480,7 @@ public class PurpurWorldConfig {
@@ -480,6 +482,7 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index 3d6d92986ab14d85cab4c35040bad47ca3c01caa..307b955876e8b7517f68b1fd581fb2dd
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -487,6 +490,7 @@ public class PurpurWorldConfig {
@@ -489,6 +492,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);

10
patches/server/0060-Villagers-follow-emerald-blocks.patch
View File

@@ -41,10 +41,10 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83
this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 307b955876e8b7517f68b1fd581fb2dd3e3edae0..0b6d19d310993cf697cb546c33efb359bb60c4a6 100644
index 67e133cc8f26d66c2282830d012117ef298ec43a..d779b6f2eca7eea2c0dba137cd8accc2cb4c005d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1230,6 +1230,7 @@ public class PurpurWorldConfig {
@@ -1232,6 +1232,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
@@ -52,7 +52,7 @@ index 307b955876e8b7517f68b1fd581fb2dd3e3edae0..0b6d19d310993cf697cb546c33efb359
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1241,6 +1242,7 @@ public class PurpurWorldConfig {
@@ -1243,6 +1244,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -60,7 +60,7 @@ index 307b955876e8b7517f68b1fd581fb2dd3e3edae0..0b6d19d310993cf697cb546c33efb359
}
public boolean vindicatorRidable = false;
@@ -1260,6 +1262,7 @@ public class PurpurWorldConfig {
@@ -1262,6 +1264,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidable = false;
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
@@ -68,7 +68,7 @@ index 307b955876e8b7517f68b1fd581fb2dd3e3edae0..0b6d19d310993cf697cb546c33efb359
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1269,6 +1272,7 @@ public class PurpurWorldConfig {
@@ -1271,6 +1274,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

10
patches/server/0061-Allow-leashing-villagers.patch
View File

@@ -49,10 +49,10 @@ index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d599
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0b6d19d310993cf697cb546c33efb359bb60c4a6..e9b1939f69f3bc28e77647c534350f1deda6d8d5 100644
index d779b6f2eca7eea2c0dba137cd8accc2cb4c005d..1c3fbd16162393a8c15c881fd3e94fdb5060668f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1231,6 +1231,7 @@ public class PurpurWorldConfig {
@@ -1233,6 +1233,7 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 0b6d19d310993cf697cb546c33efb359bb60c4a6..e9b1939f69f3bc28e77647c534350f1d
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1243,6 +1244,7 @@ public class PurpurWorldConfig {
@@ -1245,6 +1246,7 @@ public class PurpurWorldConfig {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index 0b6d19d310993cf697cb546c33efb359bb60c4a6..e9b1939f69f3bc28e77647c534350f1d
}
public boolean vindicatorRidable = false;
@@ -1263,6 +1265,7 @@ public class PurpurWorldConfig {
@@ -1265,6 +1267,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 0b6d19d310993cf697cb546c33efb359bb60c4a6..e9b1939f69f3bc28e77647c534350f1d
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1273,6 +1276,7 @@ public class PurpurWorldConfig {
@@ -1275,6 +1278,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

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

@@ -18,10 +18,10 @@ index e903fe670e50ff34187994d36a2d875d5f51bdb6..3865f16e027307f5b8b2a5617b66ffd8
for (int i = 0; i < 10; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e9b1939f69f3bc28e77647c534350f1deda6d8d5..67a4608aa553bc6e3c42c9e30cd1157bb82930f2 100644
index 1c3fbd16162393a8c15c881fd3e94fdb5060668f..0c23405bdc78e139c406b7ab0c48cd5f95042669 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1232,6 +1232,8 @@ public class PurpurWorldConfig {
@@ -1234,6 +1234,8 @@ public class PurpurWorldConfig {
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -30,7 +30,7 @@ index e9b1939f69f3bc28e77647c534350f1deda6d8d5..67a4608aa553bc6e3c42c9e30cd1157b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1245,6 +1247,8 @@ public class PurpurWorldConfig {
@@ -1247,6 +1249,8 @@ public class PurpurWorldConfig {
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

4
patches/server/0063-Implement-infinite-lava.patch
View File

@@ -58,10 +58,10 @@ index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34
protected boolean canConvertToSource() {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 67a4608aa553bc6e3c42c9e30cd1157bb82930f2..d37d9dabe054185ceb40f7a7a1471099692fce1f 100644
index 0c23405bdc78e139c406b7ab0c48cd5f95042669..0a19a28030afdd86b96c0732b5774eeb9873e863 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -211,6 +211,13 @@ public class PurpurWorldConfig {
@@ -213,6 +213,13 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0064-Make-lava-flow-speed-configurable.patch
View File

@@ -18,10 +18,10 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d37d9dabe054185ceb40f7a7a1471099692fce1f..abb50517868f17dba2d3f69bb97cc150b95047fa 100644
index 0a19a28030afdd86b96c0732b5774eeb9873e863..f6cf842119c7370923b04a46c21ec80c7725b47e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -213,9 +213,13 @@ public class PurpurWorldConfig {
@@ -215,9 +215,13 @@ public class PurpurWorldConfig {
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;

10
patches/server/0065-Add-player-death-exp-control-options.patch
View File

@@ -31,22 +31,22 @@ index e0544699714fd4c6ef2deb17f49b8246a7021463..831a62e56c745884f34fb5d8f84f0375
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index abb50517868f17dba2d3f69bb97cc150b95047fa..346c6048e0c7b72b14b2001a9071b56b4b0f37d2 100644
index f6cf842119c7370923b04a46c21ec80c7725b47e..d4611e62be817a0a8bda984643bba73a2b723532 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -163,6 +163,8 @@ public class PurpurWorldConfig {
public boolean idleTimeoutUpdateTabList = false;
@@ -164,6 +164,8 @@ public class PurpurWorldConfig {
public int playerSpawnInvulnerableTicks = 60;
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
public boolean playersShouldCramToDeath = true;
+ public String playerDeathExpDropEquation = "expLevel * 7";
+ public int playerDeathExpDropMax = 100;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -170,6 +172,8 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
@@ -172,6 +174,8 @@ public class PurpurWorldConfig {
playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
playersShouldCramToDeath = getBoolean("gameplay-mechanics.player.should-cram-to-death", playersShouldCramToDeath);
+ playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
+ playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
}

4
patches/server/0066-Configurable-void-damage-height-and-damage.patch
View File

@@ -31,10 +31,10 @@ index 54bc16b6971259f6083ca530d4109909c86a3e1e..b4640aa8fe8a37a6f27a626862b68b63
protected void updateSwingTime() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 346c6048e0c7b72b14b2001a9071b56b4b0f37d2..1decce49172573c4c5cbd8272c64483382feb09d 100644
index d4611e62be817a0a8bda984643bba73a2b723532..16712332819ad3291d903f463698d920c4515a54 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -204,10 +204,14 @@ public class PurpurWorldConfig {
@@ -206,10 +206,14 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;

4
patches/server/0068-Dispenser-curse-of-binding-protection.patch
View File

@@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..ad095c6bc7e00d286c83e37f84d8ed5d
// CraftBukkit start
Level world = pointer.getLevel();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1decce49172573c4c5cbd8272c64483382feb09d..4dad41b88b5762bc9f93313558f37c3a1f078305 100644
index 16712332819ad3291d903f463698d920c4515a54..6f0967578bf81229484ccf9aac62273c3a3682e2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -214,6 +214,11 @@ public class PurpurWorldConfig {
@@ -216,6 +216,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -17,10 +17,10 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..d4a19fc38027717e43353bc62ef23e56
} else {
return Boat.Status.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4dad41b88b5762bc9f93313558f37c3a1f078305..a0365a7b10bb77f514437f7056c7a501b565382c 100644
index 6f0967578bf81229484ccf9aac62273c3a3682e2..d1345e754720fb5ad3452139348263b0943bd2e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -201,12 +201,14 @@ public class PurpurWorldConfig {
@@ -203,12 +203,14 @@ public class PurpurWorldConfig {
});
}

6
patches/server/0070-Mending-mends-most-damages-equipment-first.patch
View File

@@ -73,10 +73,10 @@ index e246bf034a86deba5a15e7c639f5e08213fe7eee..585b29a214d0306ac2d6a170125270c1
Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
return entry != null ? entry.getValue() : ItemStack.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a0365a7b10bb77f514437f7056c7a501b565382c..19eb2faa78ea974d7d8e31bc35956aba15214e4c 100644
index d1345e754720fb5ad3452139348263b0943bd2e6..ca84f4e542b99d7c54652e1435207377058ee40d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -201,6 +201,7 @@ public class PurpurWorldConfig {
@@ -203,6 +203,7 @@ public class PurpurWorldConfig {
});
}
@@ -84,7 +84,7 @@ index a0365a7b10bb77f514437f7056c7a501b565382c..19eb2faa78ea974d7d8e31bc35956aba
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
@@ -208,6 +209,7 @@ public class PurpurWorldConfig {
@@ -210,6 +211,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
private void miscGameplayMechanicsSettings() {

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

@@ -167,10 +167,10 @@ index 04d09123f70a192f1283c0d7e8a8254f3d30889a..43ef93d2c0c59e0d7021ee9aa2b44345
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e2bf23626 100644
index 1b609e93e29c505f8fefcf1c5991499cd0383f55..d88ac515439a42a55d782b1940fb368dfce2d515 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -515,6 +515,9 @@ public class PurpurWorldConfig {
@@ -517,6 +517,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -525,6 +528,9 @@ public class PurpurWorldConfig {
@@ -527,6 +530,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
}
public boolean elderGuardianRidable = false;
@@ -737,6 +743,9 @@ public class PurpurWorldConfig {
@@ -739,6 +745,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -747,6 +756,9 @@ public class PurpurWorldConfig {
@@ -749,6 +758,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
}
public boolean illusionerRidable = false;
@@ -1449,6 +1461,9 @@ public class PurpurWorldConfig {
@@ -1451,6 +1463,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1459,6 +1474,9 @@ public class PurpurWorldConfig {
@@ -1461,6 +1476,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
}
public boolean zombieHorseRidableInWater = false;
@@ -1492,6 +1510,9 @@ public class PurpurWorldConfig {
@@ -1494,6 +1512,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1502,12 +1523,18 @@ public class PurpurWorldConfig {
@@ -1504,12 +1525,18 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index 1804be45445fee8ba4e30950792693ff47eca9a8..506b22fe75866f1c7dc1c3f15c18ae0e
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1518,5 +1545,8 @@ public class PurpurWorldConfig {
@@ -1520,5 +1547,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);

6
patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -258,10 +258,10 @@ index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc1736
private float speed = 0.1F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 506b22fe75866f1c7dc1c3f15c18ae0e2bf23626..539b32290edd76080d369b9ea2ad63704d29cfcb 100644
index d88ac515439a42a55d782b1940fb368dfce2d515..e9698b51080e8f1e8b7f717d6a624bb2c4854a3d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -928,6 +928,9 @@ public class PurpurWorldConfig {
@@ -930,6 +930,9 @@ public class PurpurWorldConfig {
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
public double phantomMaxHealth = 20.0D;
@@ -271,7 +271,7 @@ index 506b22fe75866f1c7dc1c3f15c18ae0e2bf23626..539b32290edd76080d369b9ea2ad6370
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -941,6 +944,9 @@ public class PurpurWorldConfig {
@@ -943,6 +946,9 @@ public class PurpurWorldConfig {
set("mobs.phantom.attributes.max_health", oldValue);
}
phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);

6
patches/server/0079-Add-phantom-spawning-options.patch
View File

@@ -48,10 +48,10 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..300c9f136edace2babea4a574090b184
for (int l = 0; l < k; ++l) {
// Paper start
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 539b32290edd76080d369b9ea2ad63704d29cfcb..01240f698be684cea7cd5934c5588eaaf8fb718d 100644
index e9698b51080e8f1e8b7f717d6a624bb2c4854a3d..fd23c88f09293f9686a8e28b0292b95eb6aaee9d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -931,6 +931,18 @@ public class PurpurWorldConfig {
@@ -933,6 +933,18 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -70,7 +70,7 @@ index 539b32290edd76080d369b9ea2ad63704d29cfcb..01240f698be684cea7cd5934c5588eaa
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -947,6 +959,18 @@ public class PurpurWorldConfig {
@@ -949,6 +961,18 @@ 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);

4
patches/server/0080-Implement-bed-explosion-options.patch
View File

@@ -27,10 +27,10 @@ index 163a7861f987c3832aac51cc6df950c768546731..bf5765b6af9c7807d50f7daaacb5d524
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 01240f698be684cea7cd5934c5588eaaf8fb718d..7c37a655ca165bb5bc8b98b1c62ce74ec3424eac 100644
index fd23c88f09293f9686a8e28b0292b95eb6aaee9d..8536887c6f7dd956bfed477404b956ec20847a5a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -274,6 +274,22 @@ public class PurpurWorldConfig {
@@ -276,6 +276,22 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0081-Implement-respawn-anchor-explosion-options.patch
View File

@@ -18,10 +18,10 @@ index af4eb4a8814491afef449a2874521636957d7557..365c28300ecfbe0161716972adf22a8a
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7c37a655ca165bb5bc8b98b1c62ce74ec3424eac..9b5123a723270a5f7a8ee3e207e8e6dd8e7ebfb9 100644
index 8536887c6f7dd956bfed477404b956ec20847a5a..669c8da249c0aedb511848b34ac3bf28e4a8eefc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -311,6 +311,22 @@ public class PurpurWorldConfig {
@@ -313,6 +313,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

12
patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 216ba235748215c80b6f6dc4914a24ac1d845024..1fbb9242f2dcc83befc1c91e55565e73f721af95 100644
index 288d8e687f26c8f9757db055751dded6025117d5..beb3901487525086eb3833ae51587d15c0a06036 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2457,5 +2457,25 @@ public class ServerPlayer extends Player {
@@ -55,19 +55,19 @@ index 7192cc7e5a78af2a611bfd853972ac92a5490f23..d96c4d52282e69180273322cb9a83f73
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 241439c61b8c871176f4206f22f6dfcc046c3998..4c259296f1fb038739de113c9eb0f00c5673c6ac 100644
index 5f3cdb4f286e53afdce0d14209e0bb85138b22e6..2405f4b3db32d633b74ed555a7d088272fb197bc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -226,6 +226,7 @@ public class PurpurWorldConfig {
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
@@ -227,6 +227,7 @@ public class PurpurWorldConfig {
public boolean playersShouldCramToDeath = true;
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
+ public boolean teleportIfOutsideBorder = false;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -235,6 +236,7 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
@@ -237,6 +238,7 @@ public class PurpurWorldConfig {
playersShouldCramToDeath = getBoolean("gameplay-mechanics.player.should-cram-to-death", playersShouldCramToDeath);
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
+ teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);

6
patches/server/0086-Squid-EAR-immunity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4c259296f1fb038739de113c9eb0f00c5673c6ac..7a504780ff7ce1fc3bd345d36202f42167df1b4e 100644
index 2405f4b3db32d633b74ed555a7d088272fb197bc..5fa1f90db6c6b3640968fd4ae2b9cd4953576b10 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1264,6 +1264,7 @@ public class PurpurWorldConfig {
@@ -1266,6 +1266,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index 4c259296f1fb038739de113c9eb0f00c5673c6ac..7a504780ff7ce1fc3bd345d36202f421
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1272,6 +1273,7 @@ public class PurpurWorldConfig {
@@ -1274,6 +1275,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

6
patches/server/0088-Phantoms-burn-in-light.patch
View File

@@ -47,10 +47,10 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30
list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7a504780ff7ce1fc3bd345d36202f42167df1b4e..f478cd6f8f258c5a456c0a8e54ed1274a5b7526d 100644
index 5fa1f90db6c6b3640968fd4ae2b9cd4953576b10..924f566b6b85c32be16c901b5cbeb8a9bccfc0de 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -982,6 +982,9 @@ public class PurpurWorldConfig {
@@ -984,6 +984,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -60,7 +60,7 @@ index 7a504780ff7ce1fc3bd345d36202f42167df1b4e..f478cd6f8f258c5a456c0a8e54ed1274
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1010,6 +1013,9 @@ public class PurpurWorldConfig {
@@ -1012,6 +1015,9 @@ public class PurpurWorldConfig {
phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

6
patches/server/0089-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index 3865f16e027307f5b8b2a5617b66ffd8b9f85c60..bb3572370a86519a92b7b3dab0482cd1
private boolean hungry() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f478cd6f8f258c5a456c0a8e54ed1274a5b7526d..2cf5ebe674ca8ecee7ebc7084259ac1dd8c17564 100644
index 924f566b6b85c32be16c901b5cbeb8a9bccfc0de..23a8d74066fc65545cd7eb575c28535d1be6e1cf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1407,6 +1407,7 @@ public class PurpurWorldConfig {
@@ -1409,6 +1409,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index f478cd6f8f258c5a456c0a8e54ed1274a5b7526d..2cf5ebe674ca8ecee7ebc7084259ac1d
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1422,6 +1423,7 @@ public class PurpurWorldConfig {
@@ -1424,6 +1425,7 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

4
patches/server/0090-Redstone-deactivates-spawners.patch
View File

@@ -17,10 +17,10 @@ index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2cf5ebe674ca8ecee7ebc7084259ac1dd8c17564..d0e05b1020d3bf64a6ba23ef7aac1133a7779990 100644
index 23a8d74066fc65545cd7eb575c28535d1be6e1cf..cb1fbac4081f07f272802b654701fbcfb1bb587e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -341,6 +341,11 @@ public class PurpurWorldConfig {
@@ -343,6 +343,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

6
patches/server/0091-Totems-work-in-inventory.patch
View File

@@ -29,10 +29,10 @@ index d96c4d52282e69180273322cb9a83f7365667fe3..0fa7a658af3dc1766e06d90d396a426c
event.setCancelled(itemstack == null);
this.level.getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d0e05b1020d3bf64a6ba23ef7aac1133a7779990..7bcb4fdb7733e477f306ef15667958228704a5f0 100644
index cb1fbac4081f07f272802b654701fbcfb1bb587e..0f1b5a1bc162ce859293511c8069e462cb47315b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -227,6 +227,7 @@ public class PurpurWorldConfig {
@@ -228,6 +228,7 @@ public class PurpurWorldConfig {
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
@@ -40,7 +40,7 @@ index d0e05b1020d3bf64a6ba23ef7aac1133a7779990..7bcb4fdb7733e477f306ef1566795822
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -237,6 +238,7 @@ public class PurpurWorldConfig {
@@ -239,6 +240,7 @@ public class PurpurWorldConfig {
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);

6
patches/server/0092-Add-vindicator-johnny-spawn-chance.patch
View File

@@ -30,10 +30,10 @@ index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7bcb4fdb7733e477f306ef15667958228704a5f0..0317bab2b696af2624d0384684d0e9b2e1abe749 100644
index 0f1b5a1bc162ce859293511c8069e462cb47315b..51baaed16bc600d1b420b2b81cceea25ae034615 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1436,6 +1436,7 @@ public class PurpurWorldConfig {
@@ -1438,6 +1438,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidable = false;
public boolean vindicatorRidableInWater = false;
public double vindicatorMaxHealth = 24.0D;
@@ -41,7 +41,7 @@ index 7bcb4fdb7733e477f306ef15667958228704a5f0..0317bab2b696af2624d0384684d0e9b2
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1445,6 +1446,7 @@ public class PurpurWorldConfig {
@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

4
patches/server/0094-Dispensers-place-anvils-option.patch
View File

@@ -41,10 +41,10 @@ index 92623ae25249d63efb92be8bd6c95228f9155ad2..20bf6d01046488eff53a109f5239351a
static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0317bab2b696af2624d0384684d0e9b2e1abe749..ff2f7ecafe75f8c5d17e44dd1271c24e40b57410 100644
index 51baaed16bc600d1b420b2b81cceea25ae034615..4bdf3366c21a546ac3b04e67181f18dcc94a3b8e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -300,8 +300,10 @@ public class PurpurWorldConfig {
@@ -302,8 +302,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

4
patches/server/0095-Allow-anvil-colors.patch
View File

@@ -37,10 +37,10 @@ index c81af461fa01dac0b7b26becc1a5e7ae31bb5f95..2dbc71a3d76cc87e2683b8f351bd8db0
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ff2f7ecafe75f8c5d17e44dd1271c24e40b57410..3db1e63c7689c0fa12335d2b28f500f5b48e5f18 100644
index 4bdf3366c21a546ac3b04e67181f18dcc94a3b8e..8d5c126d240ec7b69e5495580a4a6df5f51b5aac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -283,6 +283,11 @@ public class PurpurWorldConfig {
@@ -285,6 +285,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

6
patches/server/0096-Add-no-random-tick-block-list.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add no-random-tick block list
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 39402063a73fbdbefdbcd7b4f7ea675cafdfaa3a..edcc1c8ff972c94983193b0057a9d11875ecc0c6 100644
index aabeccd82153b5886e7cc59beca5a0068cd70856..08da918c3673d1fce9b283807a113d62af0af9ee 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -488,7 +488,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -35,10 +35,10 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3db1e63c7689c0fa12335d2b28f500f5b48e5f18..18ba4b452147cd2f320ac243f859f2edd39dafd1 100644
index 8d5c126d240ec7b69e5495580a4a6df5f51b5aac..fc54704ff8cb7613570860d848531a15937fb279 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -283,6 +283,28 @@ public class PurpurWorldConfig {
@@ -285,6 +285,28 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

6
patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@@ -17,10 +17,10 @@ index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 18ba4b452147cd2f320ac243f859f2edd39dafd1..8b1c836759edec76fa9337e60f8795daf9b92d22 100644
index fc54704ff8cb7613570860d848531a15937fb279..05e8e1243a37cc08842882ad0a9cfcef42605930 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -549,6 +549,7 @@ public class PurpurWorldConfig {
@@ -551,6 +551,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index 18ba4b452147cd2f320ac243f859f2edd39dafd1..8b1c836759edec76fa9337e60f8795da
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -560,6 +561,7 @@ public class PurpurWorldConfig {
@@ -562,6 +563,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

6
patches/server/0099-Stop-squids-floating-on-top-of-water.patch
View File

@@ -60,10 +60,10 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a
+ // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8b1c836759edec76fa9337e60f8795daf9b92d22..fec1dd7acd0f466cb27753bc93357ec45ed86162 100644
index 05e8e1243a37cc08842882ad0a9cfcef42605930..0f348d1c1941a4853dd4e4ee1335c95a2d904d4e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1309,6 +1309,7 @@ public class PurpurWorldConfig {
@@ -1311,6 +1311,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -71,7 +71,7 @@ index 8b1c836759edec76fa9337e60f8795daf9b92d22..fec1dd7acd0f466cb27753bc93357ec4
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1318,6 +1319,7 @@ public class PurpurWorldConfig {
@@ -1320,6 +1321,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

6
patches/server/0102-Entities-can-use-portals-configuration.patch
View File

@@ -27,10 +27,10 @@ index e43b31f07d6f0cbb35f925dca952b5947fe1fd4f..cc5854281d976c2faa453c2a6b07b574
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fec1dd7acd0f466cb27753bc93357ec45ed86162..6dd08d200d17891e9277dbef396087a1e713dc2a 100644
index 0f348d1c1941a4853dd4e4ee1335c95a2d904d4e..96998a9e692988b08b56b3eea43b7ea0851060f1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -269,6 +269,7 @@ public class PurpurWorldConfig {
@@ -271,6 +271,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
@@ -38,7 +38,7 @@ index fec1dd7acd0f466cb27753bc93357ec45ed86162..6dd08d200d17891e9277dbef396087a1
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
@@ -277,6 +278,7 @@ public class PurpurWorldConfig {
@@ -279,6 +280,7 @@ public class PurpurWorldConfig {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);

6
patches/server/0104-Customizable-wither-health-and-healing.patch
View File

@@ -23,10 +23,10 @@ index 22dd455b3b9c148f38a63f72901009f864e63a4b..689df66281ef84f0cc31d89c6f2e654c
this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6dd08d200d17891e9277dbef396087a1e713dc2a..2dabbe5d444e108fcf167dd001921c9c5c2294fd 100644
index 96998a9e692988b08b56b3eea43b7ea0851060f1..38cb0475121ae242c4174eefea9952f41339779c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1520,6 +1520,8 @@ public class PurpurWorldConfig {
@@ -1522,6 +1522,8 @@ public class PurpurWorldConfig {
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 6dd08d200d17891e9277dbef396087a1e713dc2a..2dabbe5d444e108fcf167dd001921c9c
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1534,6 +1536,8 @@ public class PurpurWorldConfig {
@@ -1536,6 +1538,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

6
patches/server/0106-Raid-cooldown-setting.patch
View File

@@ -52,10 +52,10 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
if (!this.raidMap.containsKey(raid.getId())) {
this.raidMap.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ab389b70947d4410148f3e5f243346f63784981b..f0137b639ffa7335943a7dc20d06cb582e2aee9d 100644
index 32973e3b449c6f954f49b9f8f5535ce4a6b7720d..817659cdc0ba25c3418a344661ffeb9394e91ab6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -295,6 +295,7 @@ public class PurpurWorldConfig {
@@ -297,6 +297,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -63,7 +63,7 @@ index ab389b70947d4410148f3e5f243346f63784981b..f0137b639ffa7335943a7dc20d06cb58
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -304,6 +305,7 @@ public class PurpurWorldConfig {
@@ -306,6 +307,7 @@ public class PurpurWorldConfig {
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);

4
patches/server/0107-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -289,10 +289,10 @@ index 4a11f7417b438ee5711a720aca3321c88e970b2a..46b74271ce5f614f07754db14d2a552c
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f0137b639ffa7335943a7dc20d06cb582e2aee9d..25a5d30c58b6cc7f1debe4a5e849968015c42a9a 100644
index 817659cdc0ba25c3418a344661ffeb9394e91ab6..35a775741175e0d92899ffbd16f2830103c7840d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -262,6 +262,35 @@ public class PurpurWorldConfig {
@@ -264,6 +264,35 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

6
patches/server/0108-Add-option-to-disable-zombie-aggressiveness-towards-.patch
View File

@@ -71,10 +71,10 @@ index 77002a4c3b03e0397515fd922f14e56b8e81074a..b80f7c71cbf7b10bda6fac3cfe673ac7
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 25a5d30c58b6cc7f1debe4a5e849968015c42a9a..1789dba767f0d60c461f8e1feff3a862249bd03c 100644
index 35a775741175e0d92899ffbd16f2830103c7840d..92fd37fb254eea607f1e42df668ed1c5e8928be5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1643,6 +1643,7 @@ public class PurpurWorldConfig {
@@ -1645,6 +1645,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index 25a5d30c58b6cc7f1debe4a5e849968015c42a9a..1789dba767f0d60c461f8e1feff3a862
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1656,6 +1657,7 @@ public class PurpurWorldConfig {
@@ -1658,6 +1659,7 @@ public class PurpurWorldConfig {
zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);

6
patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch
View File

@@ -189,10 +189,10 @@ index c3a07ccccd5cc38552363c82398f432c8d624288..132c9e6a643995d9fde535a78d9edc9e
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1789dba767f0d60c461f8e1feff3a862249bd03c..467faae7c7a001d0c9a2eeedb60a9efc4f8024a3 100644
index 92fd37fb254eea607f1e42df668ed1c5e8928be5..3d3cd01c7997c05430bc70099f12c68d53cfdc40 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -321,6 +321,7 @@ public class PurpurWorldConfig {
@@ -323,6 +323,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -200,7 +200,7 @@ index 1789dba767f0d60c461f8e1feff3a862249bd03c..467faae7c7a001d0c9a2eeedb60a9efc
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -331,6 +332,7 @@ public class PurpurWorldConfig {
@@ -333,6 +334,7 @@ public class PurpurWorldConfig {
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

8
patches/server/0111-Flying-squids-Oh-my.patch
View File

@@ -58,10 +58,10 @@ index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256
float f1 = Mth.cos(f) * 0.2F;
float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 467faae7c7a001d0c9a2eeedb60a9efc4f8024a3..11db98679973399dc227bb0d63ac688c81426a97 100644
index 3d3cd01c7997c05430bc70099f12c68d53cfdc40..cf20518ee737bd8b086e6d4e5d0a8236edc45a8d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -808,9 +808,11 @@ public class PurpurWorldConfig {
@@ -810,9 +810,11 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public double glowSquidMaxHealth = 10.0D;
@@ -73,7 +73,7 @@ index 467faae7c7a001d0c9a2eeedb60a9efc4f8024a3..11db98679973399dc227bb0d63ac688c
}
public boolean goatRidable = false;
@@ -1366,6 +1368,7 @@ public class PurpurWorldConfig {
@@ -1368,6 +1370,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -81,7 +81,7 @@ index 467faae7c7a001d0c9a2eeedb60a9efc4f8024a3..11db98679973399dc227bb0d63ac688c
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1376,6 +1379,7 @@ public class PurpurWorldConfig {
@@ -1378,6 +1381,7 @@ public class PurpurWorldConfig {
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);

4
patches/server/0113-Stonecutter-damage.patch
View File

@@ -61,10 +61,10 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3
} else if (blockState.is(Blocks.HONEY_BLOCK)) {
return BlockPathTypes.STICKY_HONEY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 63556973302e6073c2599730847549273a145755..23c5b84db099b2ac72699cee41f8c2084adec0ed 100644
index 2a19f9cdac1ca472ff48ede1745361df80046351..b046987913677bdcabe0134c8146cf41cf4e301a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -444,6 +444,11 @@ public class PurpurWorldConfig {
@@ -446,6 +446,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

4
patches/server/0116-Furnace-uses-lava-from-underneath.patch
View File

@@ -48,10 +48,10 @@ index 348e485897c34cca19113cc35f055a58778ca38b..fb3f7e821224889b08c0f424d79e122c
private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e23b646a5f2661a26e069021bebaa06706185d80..48de223ccbe114cbada5964535ea2bf6ffff18fe 100644
index 180a136f779935404845136319241c0b7aa1f3ea..aaa37f704948a458ec987e20879d2c7afa4a6640 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -412,6 +412,17 @@ public class PurpurWorldConfig {
@@ -414,6 +414,17 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@@ -24,10 +24,10 @@ index 5d9d77cb382c8075af2713a0ce26c28a35a0aaa8..2d4d59eb5a534e4c283933b734c44776
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 48de223ccbe114cbada5964535ea2bf6ffff18fe..5da65533393bde613635969e5333749a03a04a3b 100644
index aaa37f704948a458ec987e20879d2c7afa4a6640..a5677367307af35b9a3f234372cc30581156b730 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -408,8 +408,10 @@ public class PurpurWorldConfig {
@@ -410,8 +410,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

6
patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch
View File

@@ -95,10 +95,10 @@ index 8a9d103a579bc2a1874b99b3f8543d875cd9119f..e2ce992486308f0edff1477d78a1bef3
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a87f6bc71dfa8f5f98f592e13152a5a8384a445d..4dcff94e8ccf1af911be322c04871b8d561f60ca 100644
index a5677367307af35b9a3f234372cc30581156b730..f3cb34b45579647047a28816b13d7e63cb40bb29 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -344,6 +344,7 @@ public class PurpurWorldConfig {
@@ -346,6 +346,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
public int raidCooldownSeconds = 0;
@@ -106,7 +106,7 @@ index a87f6bc71dfa8f5f98f592e13152a5a8384a445d..4dcff94e8ccf1af911be322c04871b8d
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -355,6 +356,7 @@ public class PurpurWorldConfig {
@@ -357,6 +358,7 @@ public class PurpurWorldConfig {
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);

90
patches/server/0120-Make-entity-breeding-times-configurable.patch
View File

@@ -474,10 +474,10 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e0632db088a 100644
index f3cb34b45579647047a28816b13d7e63cb40bb29..1329774a9e4c210de5d6686b1e3af56735bd0210 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -482,9 +482,11 @@ public class PurpurWorldConfig {
@@ -484,9 +484,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean batRidable = false;
@@ -514,6 +516,7 @@ public class PurpurWorldConfig {
@@ -516,6 +518,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -524,6 +527,7 @@ public class PurpurWorldConfig {
@@ -526,6 +529,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean blazeRidable = false;
@@ -548,6 +552,7 @@ public class PurpurWorldConfig {
@@ -550,6 +554,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -560,6 +565,7 @@ public class PurpurWorldConfig {
@@ -562,6 +567,7 @@ public class PurpurWorldConfig {
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -521,7 +521,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean caveSpiderRidable = false;
@@ -580,6 +586,7 @@ public class PurpurWorldConfig {
@@ -582,6 +588,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -590,6 +597,7 @@ public class PurpurWorldConfig {
@@ -592,6 +599,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean codRidable = false;
@@ -608,6 +616,7 @@ public class PurpurWorldConfig {
@@ -610,6 +618,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -618,6 +627,7 @@ public class PurpurWorldConfig {
@@ -620,6 +629,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -553,7 +553,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean creeperRidable = false;
@@ -665,6 +675,7 @@ public class PurpurWorldConfig {
@@ -667,6 +677,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -680,6 +691,7 @@ public class PurpurWorldConfig {
@@ -682,6 +693,7 @@ public class PurpurWorldConfig {
donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -569,7 +569,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean drownedRidable = false;
@@ -786,6 +798,7 @@ public class PurpurWorldConfig {
@@ -788,6 +800,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -796,6 +809,7 @@ public class PurpurWorldConfig {
@@ -798,6 +811,7 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -585,7 +585,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean ghastRidable = false;
@@ -856,10 +870,12 @@ public class PurpurWorldConfig {
@@ -858,10 +872,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean guardianRidable = false;
@@ -877,6 +893,7 @@ public class PurpurWorldConfig {
@@ -879,6 +895,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -886,6 +903,7 @@ public class PurpurWorldConfig {
@@ -888,6 +905,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean horseRidableInWater = false;
@@ -895,6 +913,7 @@ public class PurpurWorldConfig {
@@ -897,6 +915,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -910,6 +929,7 @@ public class PurpurWorldConfig {
@@ -912,6 +931,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -630,7 +630,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean huskRidable = false;
@@ -980,6 +1000,7 @@ public class PurpurWorldConfig {
@@ -982,6 +1002,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -996,6 +1017,7 @@ public class PurpurWorldConfig {
@@ -998,6 +1019,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -646,7 +646,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean magmaCubeRidable = false;
@@ -1015,6 +1037,7 @@ public class PurpurWorldConfig {
@@ -1017,6 +1039,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1024,6 +1047,7 @@ public class PurpurWorldConfig {
@@ -1026,6 +1049,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean muleRidableInWater = false;
@@ -1033,6 +1057,7 @@ public class PurpurWorldConfig {
@@ -1035,6 +1059,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1048,11 +1073,13 @@ public class PurpurWorldConfig {
@@ -1050,11 +1075,13 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -684,7 +684,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1062,11 +1089,13 @@ public class PurpurWorldConfig {
@@ -1064,11 +1091,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1076,6 +1105,7 @@ public class PurpurWorldConfig {
@@ -1078,6 +1107,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean parrotRidable = false;
@@ -1156,6 +1186,7 @@ public class PurpurWorldConfig {
@@ -1158,6 +1188,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1166,6 +1197,7 @@ public class PurpurWorldConfig {
@@ -1168,6 +1199,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -722,7 +722,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean piglinRidable = false;
@@ -1215,6 +1247,7 @@ public class PurpurWorldConfig {
@@ -1217,6 +1249,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1227,6 +1260,7 @@ public class PurpurWorldConfig {
@@ -1229,6 +1262,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -738,7 +738,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean pufferfishRidable = false;
@@ -1246,6 +1280,7 @@ public class PurpurWorldConfig {
@@ -1248,6 +1282,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1257,6 +1292,7 @@ public class PurpurWorldConfig {
@@ -1259,6 +1294,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -754,7 +754,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean ravagerRidable = false;
@@ -1288,6 +1324,7 @@ public class PurpurWorldConfig {
@@ -1290,6 +1326,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1297,6 +1334,7 @@ public class PurpurWorldConfig {
@@ -1299,6 +1336,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean shulkerRidable = false;
@@ -1451,6 +1489,7 @@ public class PurpurWorldConfig {
@@ -1453,6 +1491,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1460,6 +1499,7 @@ public class PurpurWorldConfig {
@@ -1462,6 +1501,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean traderLlamaRidable = false;
@@ -1470,6 +1510,7 @@ public class PurpurWorldConfig {
@@ -1472,6 +1512,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1486,6 +1527,7 @@ public class PurpurWorldConfig {
@@ -1488,6 +1529,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -802,7 +802,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean tropicalFishRidable = false;
@@ -1506,6 +1548,7 @@ public class PurpurWorldConfig {
@@ -1508,6 +1550,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1518,6 +1561,7 @@ public class PurpurWorldConfig {
@@ -1520,6 +1563,7 @@ public class PurpurWorldConfig {
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -818,7 +818,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean vexRidable = false;
@@ -1546,6 +1590,7 @@ public class PurpurWorldConfig {
@@ -1548,6 +1592,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1562,6 +1607,7 @@ public class PurpurWorldConfig {
@@ -1564,6 +1609,7 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -834,7 +834,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
}
public boolean vindicatorRidable = false;
@@ -1655,6 +1701,7 @@ public class PurpurWorldConfig {
@@ -1657,6 +1703,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index 97737781cf5ee470bd24e0eabe4c777a2062b4d2..188dfe605056665d5b515efe4beb9e06
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1664,6 +1711,7 @@ public class PurpurWorldConfig {
@@ -1666,6 +1713,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -142,7 +142,7 @@ index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac5
if (((HangingEntity) object).survives()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f40cc359bb7f68e3332014c43c747b07455bff74..3cbda02809a4be857b22941716cffc8f39109359 100644
index 1329774a9e4c210de5d6686b1e3af56735bd0210..7d3d77547ad4f7d65130a8dc9d723ba04a81afa7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -97,8 +97,10 @@ public class PurpurWorldConfig {
@@ -156,7 +156,7 @@ index f40cc359bb7f68e3332014c43c747b07455bff74..3cbda02809a4be857b22941716cffc8f
}
public int daytimeTicks = 12000;
@@ -340,6 +342,7 @@ public class PurpurWorldConfig {
@@ -342,6 +344,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
@@ -164,7 +164,7 @@ index f40cc359bb7f68e3332014c43c747b07455bff74..3cbda02809a4be857b22941716cffc8f
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -352,6 +355,7 @@ public class PurpurWorldConfig {
@@ -354,6 +357,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);

6
patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch
View File

@@ -82,10 +82,10 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a251595d3a495867717305e88f60d9c6acf90021..b82fc63a86174cc1f75068d23a2fb3c92b807e88 100644
index 9dea9e7d866c0fcc5ef22784408ca834b1571d30..2923ef03bdadbd36138e2717777525411dfd0a2a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -408,6 +408,11 @@ public class PurpurWorldConfig {
@@ -410,6 +410,11 @@ public class PurpurWorldConfig {
}
}
@@ -97,7 +97,7 @@ index a251595d3a495867717305e88f60d9c6acf90021..b82fc63a86174cc1f75068d23a2fb3c9
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -477,6 +482,16 @@ public class PurpurWorldConfig {
@@ -479,6 +484,16 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}

8
patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
View File

@@ -103,10 +103,10 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca
// Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b82fc63a86174cc1f75068d23a2fb3c92b807e88..e272136f138613cdd792d5b42eb9d3647d149270 100644
index 2923ef03bdadbd36138e2717777525411dfd0a2a..3932003c23a4a46e6e74eb7f0cb01aca06371bf3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -409,8 +409,10 @@ public class PurpurWorldConfig {
@@ -411,8 +411,10 @@ public class PurpurWorldConfig {
}
public double caveVinesGrowthModifier = 0.10D;
@@ -117,7 +117,7 @@ index b82fc63a86174cc1f75068d23a2fb3c92b807e88..e272136f138613cdd792d5b42eb9d364
}
public boolean dispenserApplyCursedArmor = true;
@@ -449,6 +451,11 @@ public class PurpurWorldConfig {
@@ -451,6 +453,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}
@@ -129,7 +129,7 @@ index b82fc63a86174cc1f75068d23a2fb3c92b807e88..e272136f138613cdd792d5b42eb9d364
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -483,13 +490,17 @@ public class PurpurWorldConfig {
@@ -485,13 +492,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

6
patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
View File

@@ -21,10 +21,10 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d
private static class EndermanFreezeWhenLookedAt extends Goal {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e272136f138613cdd792d5b42eb9d3647d149270..fd380a51f0b84bcced096defc37b2e0f6222cfe9 100644
index 3932003c23a4a46e6e74eb7f0cb01aca06371bf3..2623085fa56d2ddc6ee528c1df72ec2c1f89e2e3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -786,6 +786,7 @@ public class PurpurWorldConfig {
@@ -788,6 +788,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index e272136f138613cdd792d5b42eb9d3647d149270..fd380a51f0b84bcced096defc37b2e0f
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -796,6 +797,7 @@ public class PurpurWorldConfig {
@@ -798,6 +799,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

4
patches/server/0127-Add-configurable-snowball-damage.patch
View File

@@ -18,10 +18,10 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b38a2ed581653fcd17995a66fb509a449390bc02..5628b807c63f371c2fddf544b24bd31d5a7fb452 100644
index 2623085fa56d2ddc6ee528c1df72ec2c1f89e2e3..9f6599da865d4b0d02be3d6a8dfa0cb0bf1fa68e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -284,6 +284,11 @@ public class PurpurWorldConfig {
@@ -286,6 +286,11 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

6
patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch
View File

@@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e18da294f2eb93a956c7006466aaebb2fd0f8ca3..d179d46ac3120e644b5f67b1867f6ae0a5c3cae5 100644
index 9f6599da865d4b0d02be3d6a8dfa0cb0bf1fa68e..90a510705d2febd326c3cb376fcd11bf7c1837f6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1775,6 +1775,7 @@ public class PurpurWorldConfig {
@@ -1777,6 +1777,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -55,7 +55,7 @@ index e18da294f2eb93a956c7006466aaebb2fd0f8ca3..d179d46ac3120e644b5f67b1867f6ae0
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1789,6 +1790,11 @@ public class PurpurWorldConfig {
@@ -1791,6 +1792,11 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);

8
patches/server/0131-Add-boat-fall-damage-config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1fbb9242f2dcc83befc1c91e55565e73f721af95..790a60e9375e4eea741e0b3769dda3937338746e 100644
index beb3901487525086eb3833ae51587d15c0a06036..c0d2d56fe401f4a5b2ebe67b98bac99e98d0951e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -986,7 +986,16 @@ public class ServerPlayer extends Player {
@@ -27,10 +27,10 @@ index 1fbb9242f2dcc83befc1c91e55565e73f721af95..790a60e9375e4eea741e0b3769dda393
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 50ed815e0d91ffdcdc0a15186a42a32bebe12a9f..9ca45be8960b08368057f2a1adae2fb7dea1346b 100644
index d78b29c42de7bad6a96b02b1f80911d5726abe2e..0b2a8538325204212bfe97c4e3fe5eb1ac88bd8f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -347,6 +347,7 @@ public class PurpurWorldConfig {
@@ -349,6 +349,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index 50ed815e0d91ffdcdc0a15186a42a32bebe12a9f..9ca45be8960b08368057f2a1adae2fb7
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -360,6 +361,7 @@ public class PurpurWorldConfig {
@@ -362,6 +363,7 @@ public class PurpurWorldConfig {
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);

6
patches/server/0132-Snow-Golem-rate-of-fire-config.patch
View File

@@ -23,10 +23,10 @@ index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b
this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 743c8fe9fa34b6e1fc8f46cde000295001704599..491fe8f19ae497cd1fd75b087ce08c74739c4df7 100644
index 0b2a8538325204212bfe97c4e3fe5eb1ac88bd8f..5afa5cb7a62402ef6c54a925c06b566cf8be717c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1469,6 +1469,10 @@ public class PurpurWorldConfig {
@@ -1471,6 +1471,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 743c8fe9fa34b6e1fc8f46cde000295001704599..491fe8f19ae497cd1fd75b087ce08c74
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1481,6 +1485,10 @@ public class PurpurWorldConfig {
@@ -1483,6 +1487,10 @@ public class PurpurWorldConfig {
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);

6
patches/server/0135-Lobotomize-stuck-villagers.patch
View File

@@ -53,10 +53,10 @@ index bb3572370a86519a92b7b3dab0482cd1527de19d..9a460eeb48c14590d28d071cfa5a9251
if (this.assignProfessionWhenSpawned) {
this.assignProfessionWhenSpawned = false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 491fe8f19ae497cd1fd75b087ce08c74739c4df7..716b982d6a6030328988989f1a9919b13a4c090f 100644
index 5afa5cb7a62402ef6c54a925c06b566cf8be717c..460361531b250648ec75c9165769b14d0b7f2aba 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1642,6 +1642,8 @@ public class PurpurWorldConfig {
@@ -1644,6 +1644,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -65,7 +65,7 @@ index 491fe8f19ae497cd1fd75b087ce08c74739c4df7..716b982d6a6030328988989f1a9919b1
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1659,6 +1661,13 @@ public class PurpurWorldConfig {
@@ -1661,6 +1663,13 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);

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

@@ -185,10 +185,10 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612
public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 716b982d6a6030328988989f1a9919b13a4c090f..75df5d23c72b557bd3827f96dd4db75b8def9c9d 100644
index 460361531b250648ec75c9165769b14d0b7f2aba..0f66cca38ec92a2dc12d64f02ff211f5fd675bac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1644,6 +1644,8 @@ public class PurpurWorldConfig {
@@ -1646,6 +1646,8 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -197,7 +197,7 @@ index 716b982d6a6030328988989f1a9919b13a4c090f..75df5d23c72b557bd3827f96dd4db75b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1668,6 +1670,8 @@ public class PurpurWorldConfig {
@@ -1670,6 +1672,8 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);

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

@@ -35,10 +35,10 @@ index 43ef93d2c0c59e0d7021ee9aa2b44345192cc0a9..ce780a2ba7dcbd9c1c9dc24c07387861
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 75df5d23c72b557bd3827f96dd4db75b8def9c9d..2db665335028ea92d918862ff378905ded13a8bf 100644
index 0f66cca38ec92a2dc12d64f02ff211f5fd675bac..94dc2b736de4b3c64eb95b0d035ce81d92eebb84 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1878,6 +1878,7 @@ public class PurpurWorldConfig {
@@ -1880,6 +1880,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 75df5d23c72b557bd3827f96dd4db75b8def9c9d..2db665335028ea92d918862ff378905d
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1891,5 +1892,6 @@ public class PurpurWorldConfig {
@@ -1893,5 +1894,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/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8
return super.mobInteract(player, hand);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2db665335028ea92d918862ff378905ded13a8bf..6a66297871fae48c47aa8dd5bcef18e879d62b0f 100644
index 94dc2b736de4b3c64eb95b0d035ce81d92eebb84..651860721d620c04a79643deb7705ab798a23313 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1765,6 +1765,8 @@ public class PurpurWorldConfig {
@@ -1767,6 +1767,8 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index 2db665335028ea92d918862ff378905ded13a8bf..6a66297871fae48c47aa8dd5bcef18e8
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1775,6 +1777,8 @@ public class PurpurWorldConfig {
@@ -1777,6 +1779,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0140-Configurable-default-wolf-collar-color.patch
View File

@@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6a66297871fae48c47aa8dd5bcef18e879d62b0f..c6daa9720fb1b2b692d1c752f0e9dd6fb092c0a8 100644
index 651860721d620c04a79643deb7705ab798a23313..45f44196245b2eab30ec59ce7a46f75e7dac07ad 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1765,6 +1765,7 @@ public class PurpurWorldConfig {
@@ -1767,6 +1767,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -35,7 +35,7 @@ index 6a66297871fae48c47aa8dd5bcef18e879d62b0f..c6daa9720fb1b2b692d1c752f0e9dd6f
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1777,6 +1778,11 @@ public class PurpurWorldConfig {
@@ -1779,6 +1780,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0141-Phantom-flames-on-swoop.patch
View File

@@ -17,10 +17,10 @@ index c55aba456aa144e58fc35877c61eff309eaa391f..c39e2d05fa81279a684532ee796880b1
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c6daa9720fb1b2b692d1c752f0e9dd6fb092c0a8..3e473dd83f7552155f58b7ab623b06464ac2010d 100644
index 45f44196245b2eab30ec59ce7a46f75e7dac07ad..f61fe066c4b8c1b919227c60ab3ad7d7f9b18d29 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1173,6 +1173,7 @@ public class PurpurWorldConfig {
@@ -1175,6 +1175,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index c6daa9720fb1b2b692d1c752f0e9dd6fb092c0a8..3e473dd83f7552155f58b7ab623b0646
public double phantomMaxHealth = 20.0D;
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
@@ -1199,6 +1200,7 @@ public class PurpurWorldConfig {
@@ -1201,6 +1202,7 @@ public class PurpurWorldConfig {
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);

4
patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -17,10 +17,10 @@ index d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2
return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 97e3ac74041572bbb34e5327133eb3249b334f6a..675bf59fc4762f2675cd17cc2429e297da8d458e 100644
index f61fe066c4b8c1b919227c60ab3ad7d7f9b18d29..ee23ec472f5668b83ad58b3ac7ddacd273455f6c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -424,6 +424,11 @@ public class PurpurWorldConfig {
@@ -426,6 +426,11 @@ public class PurpurWorldConfig {
caveVinesMaxGrowthAge = getInt("blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge);
}

6
patches/server/0144-Striders-give-saddle-back.patch
View File

@@ -28,10 +28,10 @@ index 294f276fa8d2d754abde11ebc3d39e5e68996b05..b3928617f732b49cfc124e9bdb879110
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0ff62f81db0f771a5d6340158cc1d1dc3641361e..73fec55dec19bdb6a2c6c2302dc7776a7f1a859a 100644
index ee23ec472f5668b83ad58b3ac7ddacd273455f6c..d972aa4fa5e184f439b5ceb8378c6c2836b203e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1548,6 +1548,7 @@ public class PurpurWorldConfig {
@@ -1550,6 +1550,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index 0ff62f81db0f771a5d6340158cc1d1dc3641361e..73fec55dec19bdb6a2c6c2302dc7776a
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1558,6 +1559,7 @@ public class PurpurWorldConfig {
@@ -1560,6 +1561,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

70
patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,10 +393,10 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
return true;
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa73759e8b656 100644
index e0a6b836600906fa0214904e57d439024a953ac7..013d975bef604775558a0ce61da2ebe1c8681ef3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -363,9 +363,12 @@ public class PurpurWorldConfig {
@@ -365,9 +365,12 @@ public class PurpurWorldConfig {
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
@@ -409,7 +409,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -377,9 +380,12 @@ public class PurpurWorldConfig {
@@ -379,9 +382,12 @@ public class PurpurWorldConfig {
boatsDoFallDamage = getBoolean("gameplay-mechanics.boat.do-fall-damage", boatsDoFallDamage);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
@@ -422,7 +422,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
@@ -449,9 +455,11 @@ public class PurpurWorldConfig {
@@ -451,9 +457,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -434,7 +434,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -483,6 +491,11 @@ public class PurpurWorldConfig {
@@ -485,6 +493,11 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}
@@ -446,7 +446,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -516,6 +529,11 @@ public class PurpurWorldConfig {
@@ -518,6 +531,11 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -458,7 +458,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -694,6 +712,7 @@ public class PurpurWorldConfig {
@@ -696,6 +714,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -705,6 +724,7 @@ public class PurpurWorldConfig {
@@ -707,6 +726,7 @@ public class PurpurWorldConfig {
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -474,7 +474,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean dolphinRidable = false;
@@ -792,6 +812,7 @@ public class PurpurWorldConfig {
@@ -794,6 +814,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -807,6 +828,7 @@ public class PurpurWorldConfig {
@@ -809,6 +830,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -490,7 +490,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean endermanRidable = false;
@@ -814,6 +836,7 @@ public class PurpurWorldConfig {
@@ -816,6 +838,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -825,6 +848,7 @@ public class PurpurWorldConfig {
@@ -827,6 +850,7 @@ public class PurpurWorldConfig {
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -506,7 +506,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean endermiteRidable = false;
@@ -844,6 +868,7 @@ public class PurpurWorldConfig {
@@ -846,6 +870,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -853,6 +878,7 @@ public class PurpurWorldConfig {
@@ -855,6 +880,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean foxRidable = false;
@@ -860,6 +886,7 @@ public class PurpurWorldConfig {
@@ -862,6 +888,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -871,6 +898,7 @@ public class PurpurWorldConfig {
@@ -873,6 +900,7 @@ public class PurpurWorldConfig {
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -538,7 +538,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean ghastRidable = false;
@@ -1266,6 +1294,7 @@ public class PurpurWorldConfig {
@@ -1268,6 +1296,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1275,6 +1304,7 @@ public class PurpurWorldConfig {
@@ -1277,6 +1306,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean piglinBruteRidable = false;
@@ -1294,6 +1324,7 @@ public class PurpurWorldConfig {
@@ -1296,6 +1326,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1303,6 +1334,7 @@ public class PurpurWorldConfig {
@@ -1305,6 +1336,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean polarBearRidable = false;
@@ -1344,6 +1376,7 @@ public class PurpurWorldConfig {
@@ -1346,6 +1378,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1356,11 +1389,13 @@ public class PurpurWorldConfig {
@@ -1358,11 +1391,13 @@ public class PurpurWorldConfig {
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1370,6 +1405,7 @@ public class PurpurWorldConfig {
@@ -1372,6 +1407,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean salmonRidable = false;
@@ -1388,6 +1424,7 @@ public class PurpurWorldConfig {
@@ -1390,6 +1426,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1398,6 +1435,7 @@ public class PurpurWorldConfig {
@@ -1400,6 +1437,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean shulkerRidable = false;
@@ -1417,6 +1455,7 @@ public class PurpurWorldConfig {
@@ -1419,6 +1457,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1426,6 +1465,7 @@ public class PurpurWorldConfig {
@@ -1428,6 +1467,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean skeletonRidable = false;
@@ -1493,6 +1533,7 @@ public class PurpurWorldConfig {
@@ -1495,6 +1535,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1509,6 +1550,7 @@ public class PurpurWorldConfig {
@@ -1511,6 +1552,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -648,7 +648,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean squidRidable = false;
@@ -1668,6 +1710,7 @@ public class PurpurWorldConfig {
@@ -1670,6 +1712,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1694,6 +1737,7 @@ public class PurpurWorldConfig {
@@ -1696,6 +1739,7 @@ public class PurpurWorldConfig {
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean vindicatorRidable = false;
@@ -1750,6 +1794,7 @@ public class PurpurWorldConfig {
@@ -1752,6 +1796,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1766,6 +1811,7 @@ public class PurpurWorldConfig {
@@ -1768,6 +1813,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -680,7 +680,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
}
public boolean witherSkeletonRidable = false;
@@ -1833,6 +1879,7 @@ public class PurpurWorldConfig {
@@ -1835,6 +1881,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa737
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1852,6 +1899,7 @@ public class PurpurWorldConfig {
@@ -1854,6 +1901,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}

6
patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch
View File

@@ -22,10 +22,10 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc
org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4f05a6242af095627d85ac34003208d092fb96cc..0022a46299409d567c70d4bea5d1efc7c83e1dbb 100644
index 013d975bef604775558a0ce61da2ebe1c8681ef3..c1edb1afdab489bc1fea8d0783ea70ee060ce52d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -366,6 +366,7 @@ public class PurpurWorldConfig {
@@ -368,6 +368,7 @@ public class PurpurWorldConfig {
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
public boolean milkCuresBadOmen = true;
@@ -33,7 +33,7 @@ index 4f05a6242af095627d85ac34003208d092fb96cc..0022a46299409d567c70d4bea5d1efc7
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
public boolean projectilesBypassMobGriefing = false;
@@ -383,6 +384,7 @@ public class PurpurWorldConfig {
@@ -385,6 +386,7 @@ public class PurpurWorldConfig {
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

6
patches/server/0151-Add-EntityTeleportHinderedEvent.patch
View File

@@ -78,10 +78,10 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0022a46299409d567c70d4bea5d1efc7c83e1dbb..c25a85c7e167207b21bf53a802921fc54d21c1a8 100644
index c1edb1afdab489bc1fea8d0783ea70ee060ce52d..d6b0d0473fe231825a8882eb07b4b98c1198164e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -365,6 +365,7 @@ public class PurpurWorldConfig {
@@ -367,6 +367,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
@@ -89,7 +89,7 @@ index 0022a46299409d567c70d4bea5d1efc7c83e1dbb..c25a85c7e167207b21bf53a802921fc5
public boolean milkCuresBadOmen = true;
public boolean noteBlockIgnoreAbove = false;
public boolean persistentTileEntityDisplayNames = false;
@@ -383,6 +384,7 @@ public class PurpurWorldConfig {
@@ -385,6 +386,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);

4
patches/server/0153-Farmland-trampling-changes.patch
View File

@@ -37,10 +37,10 @@ index aad204181c4f54ee533bfe3fc04a8705b847e371..16eb80e7926cf4fe421c17d7d851d457
if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
return;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7ff29701790a46d0ea8d58e54cc3f0e9b7999105..34ee48033c1c751ec905da04f69627749cef5ee0 100644
index d6b0d0473fe231825a8882eb07b4b98c1198164e..720a693d7b6f455b79aca7080d6be37162618ca3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -462,10 +462,16 @@ public class PurpurWorldConfig {
@@ -464,10 +464,16 @@ public class PurpurWorldConfig {
public boolean farmlandBypassMobGriefing = false;
public boolean farmlandGetsMoistFromBelow = false;
public boolean farmlandAlpha = false;

8
patches/server/0155-Fix-stuck-in-portals.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 790a60e9375e4eea741e0b3769dda3937338746e..d2fc063236003c9c69ec251b214dfab40becdd25 100644
index c0d2d56fe401f4a5b2ebe67b98bac99e98d0951e..3cb7d4ded16e2151797bf698a26f9d25b0a07c25 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1136,6 +1136,7 @@ public class ServerPlayer extends Player {
@@ -37,10 +37,10 @@ index 1029b004b526acbeecc1f2e82ddae00ff3de1196..1f06a8b4102d8736755e052f03d3bfb0
this.isInsidePortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 309bfce0508b33e755f35875b025aa1413179955..e1aca2c5253f26125e1154e75c8c2cbcd98af496 100644
index 81eb889ccb63680abd674eac5f902458af924069..088b0f8bb5ab744f41dcbeb06a71163b20ebd849 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -292,6 +292,7 @@ public class PurpurWorldConfig {
@@ -293,6 +293,7 @@ public class PurpurWorldConfig {
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
@@ -48,7 +48,7 @@ index 309bfce0508b33e755f35875b025aa1413179955..e1aca2c5253f26125e1154e75c8c2cbc
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -303,6 +304,7 @@ public class PurpurWorldConfig {
@@ -305,6 +306,7 @@ public class PurpurWorldConfig {
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);

18
patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -70,10 +70,10 @@ index b3928617f732b49cfc124e9bdb879110413defd7..1c6d29a30df66e9971cd50e264bb4455
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9a6a9c903 100644
index 088b0f8bb5ab744f41dcbeb06a71163b20ebd849..e77673999cf539e92c450c9e25b984377e66de62 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -629,6 +629,7 @@ public class PurpurWorldConfig {
@@ -631,6 +631,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -639,6 +640,7 @@ public class PurpurWorldConfig {
@@ -641,6 +642,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9
}
public boolean catRidable = false;
@@ -855,6 +857,7 @@ public class PurpurWorldConfig {
@@ -857,6 +859,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -867,6 +870,7 @@ public class PurpurWorldConfig {
@@ -869,6 +872,7 @@ public class PurpurWorldConfig {
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -105,7 +105,7 @@ index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9
}
public boolean endermiteRidable = false;
@@ -1552,6 +1556,7 @@ public class PurpurWorldConfig {
@@ -1554,6 +1558,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1569,6 +1574,7 @@ public class PurpurWorldConfig {
@@ -1571,6 +1576,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -121,7 +121,7 @@ index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9
}
public boolean squidRidable = false;
@@ -1622,6 +1628,7 @@ public class PurpurWorldConfig {
@@ -1624,6 +1630,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1633,6 +1640,7 @@ public class PurpurWorldConfig {
@@ -1635,6 +1642,7 @@ public class PurpurWorldConfig {
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);

6
patches/server/0157-Config-to-always-tame-in-Creative.patch
View File

@@ -59,10 +59,10 @@ index 518dd0e6b4889c049e438b393baa795a5eac3e7d..21e154c4e7fe261a41c891b481072fbd
this.navigation.stop();
this.setTarget((LivingEntity) null);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5507cf137dfc3167efdb19a550148e88e96c4a6b..261873cbcbf1bfdd4aa6527d14b68a97f2aec90b 100644
index e77673999cf539e92c450c9e25b984377e66de62..227d03c46f00fb4aeacb8c0e11eb3649f5255fc6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -367,6 +367,7 @@ public class PurpurWorldConfig {
@@ -369,6 +369,7 @@ public class PurpurWorldConfig {
}
public boolean useBetterMending = false;
@@ -70,7 +70,7 @@ index 5507cf137dfc3167efdb19a550148e88e96c4a6b..261873cbcbf1bfdd4aa6527d14b68a97
public boolean boatEjectPlayersOnLand = false;
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
@@ -386,6 +387,7 @@ public class PurpurWorldConfig {
@@ -388,6 +389,7 @@ public class PurpurWorldConfig {
public int animalBreedingCooldownSeconds = 0;
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);

4
patches/server/0158-End-crystal-explosion-options.patch
View File

@@ -52,10 +52,10 @@ index 92e65f3fbc8f5d77bb8cc31e7a7780c2589f4227..0c46507ab0b904fb1f79bc5421c88c03
this.onDestroyedBy(source);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 261873cbcbf1bfdd4aa6527d14b68a97f2aec90b..031745f64c3e79f5a0067bf09c069c65496652d1 100644
index 227d03c46f00fb4aeacb8c0e11eb3649f5255fc6..6a814b743bc775b54026899c521379c2e87c0e0e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -469,6 +469,35 @@ public class PurpurWorldConfig {
@@ -471,6 +471,35 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}

10
patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
View File

@@ -29,10 +29,10 @@ index 15d35d325b66e1a417eb7ba699597d627bd4eb54..36745f845f33c877595d572e46bd8e96
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4eb8c5ba7a8f05c1e83a6f9b92928e3796e2173d..d22e391f27f0d0ce41c4429ac36211739b6164d8 100644
index 6a814b743bc775b54026899c521379c2e87c0e0e..3167b821798428e955daa421ca121b3403bc7ff4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -864,6 +864,7 @@ public class PurpurWorldConfig {
@@ -866,6 +866,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
public boolean enderDragonBypassMobGriefing = false;
@@ -40,7 +40,7 @@ index 4eb8c5ba7a8f05c1e83a6f9b92928e3796e2173d..d22e391f27f0d0ce41c4429ac3621173
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -880,6 +881,7 @@ public class PurpurWorldConfig {
@@ -882,6 +883,7 @@ public class PurpurWorldConfig {
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
@@ -48,7 +48,7 @@ index 4eb8c5ba7a8f05c1e83a6f9b92928e3796e2173d..d22e391f27f0d0ce41c4429ac3621173
}
public boolean endermanRidable = false;
@@ -1852,6 +1854,7 @@ public class PurpurWorldConfig {
@@ -1854,6 +1856,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -56,7 +56,7 @@ index 4eb8c5ba7a8f05c1e83a6f9b92928e3796e2173d..d22e391f27f0d0ce41c4429ac3621173
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1869,6 +1872,7 @@ public class PurpurWorldConfig {
@@ -1871,6 +1874,7 @@ public class PurpurWorldConfig {
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);

6
patches/server/0162-One-Punch-Man.patch
View File

@@ -30,10 +30,10 @@ index 5c82dd279fc3a5847e2e0ed6c9cf9e70acfb3bff..c123e723d4fc3202eb7a4c74a356ffcd
if (human) {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b12404430997b17139324aef7ea61cc56682c51f..5b056cd60d13100980f50b56217207e160562701 100644
index a9fd8ebf763b379a203c17a54fce5e841249d5ca..8d3f8d49cef5e1699299e24bc856ae2c37d1169a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -297,6 +297,7 @@ public class PurpurWorldConfig {
@@ -298,6 +298,7 @@ public class PurpurWorldConfig {
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
@@ -41,7 +41,7 @@ index b12404430997b17139324aef7ea61cc56682c51f..5b056cd60d13100980f50b56217207e1
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -309,6 +310,7 @@ public class PurpurWorldConfig {
@@ -311,6 +312,7 @@ public class PurpurWorldConfig {
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);

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

@@ -29,10 +29,10 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dd475d9722e5292cbcdcfe65892b3c047b5d320e..7f4605244f31b43274b4caa7bbb827e28f3c5bfb 100644
index 8d3f8d49cef5e1699299e24bc856ae2c37d1169a..f30b3007ff52344bfe17fa54f57b8072bf891d99 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -530,6 +530,11 @@ public class PurpurWorldConfig {
@@ -532,6 +532,11 @@ public class PurpurWorldConfig {
furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
}

8
patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d2fc063236003c9c69ec251b214dfab40becdd25..fedd506fe05b259c64dba4ce5ffab06cd2e717a8 100644
index 3cb7d4ded16e2151797bf698a26f9d25b0a07c25..03abb8ce73a7f1b640a30e4dd56ae990df7b0c3c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1299,7 +1299,7 @@ public class ServerPlayer extends Player {
@@ -18,10 +18,10 @@ index d2fc063236003c9c69ec251b214dfab40becdd25..fedd506fe05b259c64dba4ce5ffab06c
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1f419bc31e90a4a09fd65ba3de4a46688292bbce..0086dd4f784cfe8d8f3fb7c531b32091f7f19b0a 100644
index ab24cdcbea8906af1f68990c654778801b31443e..617e6151895ebc7c1b6d42619f0bd1b1a9f85efe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -306,6 +306,7 @@ public class PurpurWorldConfig {
@@ -307,6 +307,7 @@ public class PurpurWorldConfig {
public boolean totemOfUndyingWorksInInventory = false;
public boolean playerFixStuckPortal = false;
public boolean creativeOnePunch = false;
@@ -29,7 +29,7 @@ index 1f419bc31e90a4a09fd65ba3de4a46688292bbce..0086dd4f784cfe8d8f3fb7c531b32091
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -319,6 +320,7 @@ public class PurpurWorldConfig {
@@ -321,6 +322,7 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);

6
patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch
View File

@@ -18,10 +18,10 @@ index 3907b7cb559dabdd3cc347678d42071215c66a6c..e8779b23b5e1a399dde19fc66d820101
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d313e93f85d02f930c59ae8214fdc7752d2bc3e5..7d15830798c1aca78c40c72a4ecbf8cec2cbf730 100644
index 617e6151895ebc7c1b6d42619f0bd1b1a9f85efe..60e029e6416e6a1f1911ade3abbc04f34bd6422d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -912,6 +912,8 @@ public class PurpurWorldConfig {
@@ -914,6 +914,8 @@ public class PurpurWorldConfig {
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index d313e93f85d02f930c59ae8214fdc7752d2bc3e5..7d15830798c1aca78c40c72a4ecbf8ce
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -920,11 +922,17 @@ public class PurpurWorldConfig {
@@ -922,11 +924,17 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max-health", null);
set("mobs.enderman.attributes.max_health", oldValue);
}

6
patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
View File

@@ -20,10 +20,10 @@ index e8779b23b5e1a399dde19fc66d820101d61f36bc..ba61f78874d8578b862f317fe00a3162
} else {
Vec3 vec3d = player.getViewVector(1.0F).normalize();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7d15830798c1aca78c40c72a4ecbf8cec2cbf730..0d9c4112b0a3d3d76f9545b4a66716ace9dc8f26 100644
index 60e029e6416e6a1f1911ade3abbc04f34bd6422d..ec2ce1c5629eae5b50e814c1ac88026e08f83566 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -914,6 +914,8 @@ public class PurpurWorldConfig {
@@ -916,6 +916,8 @@ public class PurpurWorldConfig {
public boolean endermanTakeDamageFromWater = true;
public boolean endermanAggroEndermites = true;
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index 7d15830798c1aca78c40c72a4ecbf8cec2cbf730..0d9c4112b0a3d3d76f9545b4a66716ac
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -933,6 +935,8 @@ public class PurpurWorldConfig {
@@ -935,6 +937,8 @@ public class PurpurWorldConfig {
endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);

6
patches/server/0169-Tick-fluids-config.patch
View File

@@ -36,10 +36,10 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b9e3ddb7905dbbd91b856e7265f5dde9ecea3857..1a0fd073cc4264a9bb1d2788bc36791d9d64c3aa 100644
index ec2ce1c5629eae5b50e814c1ac88026e08f83566..3ddaf7c698ea4274cde42441a99739379b5b9083 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -396,6 +396,7 @@ public class PurpurWorldConfig {
@@ -398,6 +398,7 @@ public class PurpurWorldConfig {
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
public boolean projectilesBypassMobGriefing = false;
@@ -47,7 +47,7 @@ index b9e3ddb7905dbbd91b856e7265f5dde9ecea3857..1a0fd073cc4264a9bb1d2788bc36791d
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -416,6 +417,7 @@ public class PurpurWorldConfig {
@@ -418,6 +419,7 @@ public class PurpurWorldConfig {
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing);

6
patches/server/0170-Config-to-disable-Llama-caravans.patch
View File

@@ -32,10 +32,10 @@ index 93a05b945ac248df0ea7a0b9d7264a9c129c3bcf..8f12851f220bb23102f52f523a4c5d98
this.caravanHead.caravanTail = this;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b59c39d0aa9693e648920d23d055e970e7e08cf9..44a8fe9b633ce512c4ad45fe5edb72afc842f8ee 100644
index 3ddaf7c698ea4274cde42441a99739379b5b9083..809c6855d48c6d7fface4224bac7ea2ea5d1246c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1180,6 +1180,7 @@ public class PurpurWorldConfig {
@@ -1182,6 +1182,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index b59c39d0aa9693e648920d23d055e970e7e08cf9..44a8fe9b633ce512c4ad45fe5edb72af
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1197,6 +1198,7 @@ public class PurpurWorldConfig {
@@ -1199,6 +1200,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);

6
patches/server/0171-Config-to-make-Creepers-explode-on-death.patch
View File

@@ -50,10 +50,10 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019
private void spawnLingeringCloud() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 44a8fe9b633ce512c4ad45fe5edb72afc842f8ee..e01a4d1de37535c189694097c37427f61e9eef86 100644
index 809c6855d48c6d7fface4224bac7ea2ea5d1246c..2ddfbfc181bef61feed6b3c9f7f82c4c6a7d0551 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -787,6 +787,7 @@ public class PurpurWorldConfig {
@@ -789,6 +789,7 @@ public class PurpurWorldConfig {
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
@@ -61,7 +61,7 @@ index 44a8fe9b633ce512c4ad45fe5edb72afc842f8ee..e01a4d1de37535c189694097c37427f6
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -799,6 +800,7 @@ public class PurpurWorldConfig {
@@ -801,6 +802,7 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);

6
patches/server/0172-Configurable-ravager-griefable-blocks-list.patch
View File

@@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e01a4d1de37535c189694097c37427f61e9eef86..f4e2e13591948e4f20d17670279d7f8dc30d6fb3 100644
index 2ddfbfc181bef61feed6b3c9f7f82c4c6a7d0551..2b78834abbf7ada84aa929024b683af2944053a9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1490,6 +1490,7 @@ public class PurpurWorldConfig {
@@ -1492,6 +1492,7 @@ public class PurpurWorldConfig {
public boolean ravagerRidableInWater = false;
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index e01a4d1de37535c189694097c37427f61e9eef86..f4e2e13591948e4f20d17670279d7f8d
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1500,6 +1501,23 @@ public class PurpurWorldConfig {
@@ -1502,6 +1503,23 @@ public class PurpurWorldConfig {
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);

4
patches/server/0173-Sneak-to-bulk-process-composter.patch
View File

@@ -62,10 +62,10 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378
int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6a7827fd7f47dd4a6d46b7769ac9d0da3a108b3b..9b4731e9a9c60efce9eae15995aa447dec045ec4 100644
index 2b78834abbf7ada84aa929024b683af2944053a9..521e8a604b5b99e0425846e788198c4f104a9343 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -480,6 +480,11 @@ public class PurpurWorldConfig {
@@ -482,6 +482,11 @@ public class PurpurWorldConfig {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
}

8
patches/server/0174-Config-for-skipping-night.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 07e6d7b7a6d275010797c991be977d6136478c8b..f94c1b943488806d1336bd28ac9e8efd9e1fedbd 100644
index 7b823fb8e94ba26a2f7209ebd8f71ad6b50e252d..84a94787952a4b588fad81e8840a0b124f0d5f78 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -761,7 +761,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -18,10 +18,10 @@ index 07e6d7b7a6d275010797c991be977d6136478c8b..f94c1b943488806d1336bd28ac9e8efd
long l = this.levelData.getDayTime() + 24000L;
TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9b4731e9a9c60efce9eae15995aa447dec045ec4..fa9c318e229b74b5aabf1a43245d1a125f55c4c6 100644
index 521e8a604b5b99e0425846e788198c4f104a9343..87aa9f5fd5dfeedb16eb52333a87e77b42d5110c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -307,6 +307,7 @@ public class PurpurWorldConfig {
@@ -308,6 +308,7 @@ public class PurpurWorldConfig {
public boolean playerFixStuckPortal = false;
public boolean creativeOnePunch = false;
public boolean playerSleepNearMonsters = false;
@@ -29,7 +29,7 @@ index 9b4731e9a9c60efce9eae15995aa447dec045ec4..fa9c318e229b74b5aabf1a43245d1a12
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -321,6 +322,7 @@ public class PurpurWorldConfig {
@@ -323,6 +324,7 @@ public class PurpurWorldConfig {
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);

10
patches/server/0175-Add-config-for-villager-trading.patch
View File

@@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2
this.openTradingScreen(player, this.getDisplayName(), 1);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 51dee2334645564520e1caadeb84513df38d4b3d..8db9f5a20a3cfffcb89f9fb0b1e664cc3ef45d13 100644
index 87aa9f5fd5dfeedb16eb52333a87e77b42d5110c..049add966dd91dee8604b21d76468ebaaa211e1d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1834,6 +1834,7 @@ public class PurpurWorldConfig {
@@ -1836,6 +1836,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 51dee2334645564520e1caadeb84513df38d4b3d..8db9f5a20a3cfffcb89f9fb0b1e664cc
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1861,6 +1862,7 @@ public class PurpurWorldConfig {
@@ -1863,6 +1864,7 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -50,7 +50,7 @@ index 51dee2334645564520e1caadeb84513df38d4b3d..8db9f5a20a3cfffcb89f9fb0b1e664cc
}
public boolean vindicatorRidable = false;
@@ -1884,6 +1886,7 @@ public class PurpurWorldConfig {
@@ -1886,6 +1888,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -58,7 +58,7 @@ index 51dee2334645564520e1caadeb84513df38d4b3d..8db9f5a20a3cfffcb89f9fb0b1e664cc
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1895,6 +1898,7 @@ public class PurpurWorldConfig {
@@ -1897,6 +1900,7 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);

4
patches/server/0178-Break-individual-slabs-when-sneaking.patch
View File

@@ -47,10 +47,10 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a49d208bbda78012db46ed13c4fe14bc3425f94d..bf482183eb820e0e0c01d98d27d8d99ad69e5309 100644
index 57776ea61073dee3b0493c19e731d1a5c1f12a96..9ff72033527d6a1578ff69232bc1c75eea822756 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -607,6 +607,11 @@ public class PurpurWorldConfig {
@@ -609,6 +609,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

4
patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch
View File

@@ -22,10 +22,10 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899
return false;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bf482183eb820e0e0c01d98d27d8d99ad69e5309..dd067671dfdcf0baaf8ff171bc4e0ef92ccc669c 100644
index 9ff72033527d6a1578ff69232bc1c75eea822756..76ed1189124935f979bca5c2a7783261526815d1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -559,8 +559,12 @@ public class PurpurWorldConfig {
@@ -561,8 +561,12 @@ public class PurpurWorldConfig {
}
public boolean snowOnBlueIce = true;

4
patches/server/0181-Option-to-make-doors-require-redstone.patch
View File

@@ -67,10 +67,10 @@ index c903a1a8d2234bb0fa354d1c44ff3ab2275b04c7..d01e4064a772710c1383927e0848b9b3
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 042bfcfa408412472deeed7e6f5660ad2028e141..87d4f1efd11f4e6e0e1559085ea72664158e827b 100644
index f2b0168fd4f37503a03841f07019829080f92ab5..614bcefae853f48e7f86097579e39a06a060a28c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -505,6 +505,16 @@ public class PurpurWorldConfig {
@@ -507,6 +507,16 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}

4
patches/server/0183-Configurable-sponge-absorption.patch
View File

@@ -43,10 +43,10 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 831e4ec10f4221f5be053a9b4c77cf29454e2068..ab9934c48fc6d43fd3b8762bd9978290a2db7d19 100644
index 614bcefae853f48e7f86097579e39a06a060a28c..267161bdd72b0c10ba7358b59a164dc1de46997a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -633,6 +633,13 @@ public class PurpurWorldConfig {
@@ -635,6 +635,13 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

4
patches/server/0184-Projectile-offset-config.patch
View File

@@ -96,10 +96,10 @@ index 3f53dc8f250ad3f7616ce7ef0a2353caa0ab1879..29130aa9673a3956030f3e43b784ac46
entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 543fcbaa0f1f4f26386b9e1528c85afc5715b519..1e00048d25ef3b977a65a58bd58f962e377f08d9 100644
index 267161bdd72b0c10ba7358b59a164dc1de46997a..7c3de614642c628e6f044e7b0ab955373766fbe6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -370,6 +370,23 @@ public class PurpurWorldConfig {
@@ -372,6 +372,23 @@ public class PurpurWorldConfig {
witherSkullDespawnRate = getInt("gameplay-mechanics.projectile-despawn-rates.wither_skull", witherSkullDespawnRate);
}

4
patches/server/0185-Config-for-powered-rail-activation-distance.patch
View File

@@ -18,10 +18,10 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
} else {
int j = pos.getX();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5c3c2b0cbc27db807a6722a7d30548c2f35dea91..763467124c35ad3ce88b0197bca476a79b5bf9d7 100644
index 7c3de614642c628e6f044e7b0ab955373766fbe6..95b327075bd88a52b941576cf8a298150e69c2cc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -645,6 +645,11 @@ public class PurpurWorldConfig {
@@ -647,6 +647,11 @@ public class PurpurWorldConfig {
slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak);
}

6
patches/server/0186-Piglin-portal-spawn-modifier.patch
View File

@@ -31,10 +31,10 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030
pos = pos.below();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 763467124c35ad3ce88b0197bca476a79b5bf9d7..7b15f53b618815ea20bc2b31cb5a42aa2cd4b049 100644
index 95b327075bd88a52b941576cf8a298150e69c2cc..3ec464db79dd1e30beb6fb8f9128cf39ae2a6fe4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1455,6 +1455,7 @@ public class PurpurWorldConfig {
@@ -1457,6 +1457,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
public boolean piglinBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 763467124c35ad3ce88b0197bca476a79b5bf9d7..7b15f53b618815ea20bc2b31cb5a42aa
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1465,6 +1466,7 @@ public class PurpurWorldConfig {
@@ -1467,6 +1468,7 @@ public class PurpurWorldConfig {
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);

4
patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch
View File

@@ -31,10 +31,10 @@ index 5d844ed98b916298a657d5e9766ab7f383a304e0..0129460ce1ca199a47b6657f824c75fd
entity.hurt(DamageSource.HOT_FLOOR, 1.0F);
org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7b15f53b618815ea20bc2b31cb5a42aa2cd4b049..32794e051182f0e5f4fffb47e33fa983e7ca53ae 100644
index 3ec464db79dd1e30beb6fb8f9128cf39ae2a6fe4..f999bf58d6f94ca65a2bd978fb806fa8c505cc09 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -612,6 +612,13 @@ public class PurpurWorldConfig {
@@ -614,6 +614,13 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}

6
patches/server/0189-Config-for-wither-explosion-radius.patch
View File

@@ -18,10 +18,10 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 32794e051182f0e5f4fffb47e33fa983e7ca53ae..b52e0bf5e971c6a9dba36a2a822fb2ae923f05c8 100644
index f999bf58d6f94ca65a2bd978fb806fa8c505cc09..6242a336b387dc4056ec3b4ffb1e179666a597bd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1991,6 +1991,7 @@ public class PurpurWorldConfig {
@@ -1993,6 +1993,7 @@ public class PurpurWorldConfig {
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index 32794e051182f0e5f4fffb47e33fa983e7ca53ae..b52e0bf5e971c6a9dba36a2a822fb2ae
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2009,6 +2010,7 @@ public class PurpurWorldConfig {
@@ -2011,6 +2012,7 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);

4
patches/server/0191-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
View File

@@ -18,10 +18,10 @@ index e5562b407bba35ab93bf8bc3c22ac9d45e8353cb..c688bb73cd062f36524cfc231cb691f2
if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) {
level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 21b93ca575cd33ccd29699a2f93a635b4ec48de8..3b18239e5389e91142f71e799c1826a252e4a1ce 100644
index 6242a336b387dc4056ec3b4ffb1e179666a597bd..d3786053460c0285be956ef1118669e0093f46c9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -387,6 +387,21 @@ public class PurpurWorldConfig {
@@ -389,6 +389,21 @@ public class PurpurWorldConfig {
snowballProjectileOffset = getDouble("gameplay-mechanics.projectile-offset.snowball", snowballProjectileOffset);
}

4
patches/server/0192-Configurable-piston-push-limit.patch
View File

@@ -36,10 +36,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6f4b7688d3530a421ff92a328069f39dd2cea6a6..58f52e054f80ece6ffd98cdd9b7df70c8c53dc47 100644
index d3786053460c0285be956ef1118669e0093f46c9..4857f721d809d776398d5c822847c4e8da0841ec 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -634,6 +634,11 @@ public class PurpurWorldConfig {
@@ -636,6 +636,11 @@ public class PurpurWorldConfig {
magmaBlockDamageWithFrostWalker = getBoolean("blocks.magma-block.damage-with-frost-walker", magmaBlockDamageWithFrostWalker);
}

6
patches/server/0195-Configurable-mob-blindness.patch
View File

@@ -28,10 +28,10 @@ index 0a50c0d3450430de9b6251aa65a8bfc8633a8502..521a353a1de6573b7e4fcebc673494cd
return d0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8ac0465f3576b47a18e3fd5a70a4ed091fa4f57d..38800a6f2b272c1963a7dae218e888c40f4235e6 100644
index 4857f721d809d776398d5c822847c4e8da0841ec..0a61318235c377eda1c172741ddf386f3b29d764 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -442,6 +442,7 @@ public class PurpurWorldConfig {
@@ -444,6 +444,7 @@ public class PurpurWorldConfig {
public boolean persistentDroppableEntityDisplayNames = false;
public boolean projectilesBypassMobGriefing = false;
public boolean tickFluids = true;
@@ -39,7 +39,7 @@ index 8ac0465f3576b47a18e3fd5a70a4ed091fa4f57d..38800a6f2b272c1963a7dae218e888c4
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -463,6 +464,7 @@ public class PurpurWorldConfig {
@@ -465,6 +466,7 @@ public class PurpurWorldConfig {
persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing);
tickFluids = getBoolean("gameplay-mechanics.tick-fluids", tickFluids);

6
patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch
View File

@@ -21,10 +21,10 @@ index 02494dcc8a342f65b2855612aebeb019095abf65..d66c8866f3c6b1412a6c1876c62e3b29
if (!event.isCancelled()) {
this.dead = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1adb54ed0a8aa57fad12cd96b24cebc27566a864..d47156fd8be225852cc321c6d956e25ff3da120e 100644
index 0a61318235c377eda1c172741ddf386f3b29d764..2c790011043065158a1ab092aa417fd8df45f246 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -883,6 +883,7 @@ public class PurpurWorldConfig {
@@ -885,6 +885,7 @@ public class PurpurWorldConfig {
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index 1adb54ed0a8aa57fad12cd96b24cebc27566a864..d47156fd8be225852cc321c6d956e25f
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -896,6 +897,7 @@ public class PurpurWorldConfig {
@@ -898,6 +899,7 @@ public class PurpurWorldConfig {
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);

6
patches/server/0198-Iron-golem-poppy-calms-anger.patch
View File

@@ -17,10 +17,10 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63
this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d47156fd8be225852cc321c6d956e25ff3da120e..4889ab24ad48fe958e29b634980c69191a7dbd32 100644
index 2c790011043065158a1ab092aa417fd8df45f246..1ca8fe623c69d5149d22902087be6a08b0aef73f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1258,6 +1258,7 @@ public class PurpurWorldConfig {
@@ -1260,6 +1260,7 @@ public class PurpurWorldConfig {
public boolean ironGolemRidableInWater = false;
public boolean ironGolemCanSwim = false;
public double ironGolemMaxHealth = 100.0D;
@@ -28,7 +28,7 @@ index d47156fd8be225852cc321c6d956e25ff3da120e..4889ab24ad48fe958e29b634980c6919
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1268,6 +1269,7 @@ public class PurpurWorldConfig {
@@ -1270,6 +1271,7 @@ public class PurpurWorldConfig {
set("mobs.iron_golem.attributes.max_health", oldValue);
}
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);

6
patches/server/0199-Breedable-parrots.patch
View File

@@ -50,10 +50,10 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4889ab24ad48fe958e29b634980c69191a7dbd32..3332180fa9489622f4fc94c0906fd1afa7a269f5 100644
index 1ca8fe623c69d5149d22902087be6a08b0aef73f..0d541b04824a2ef3ef05f257e7a7243931ea9835 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1394,6 +1394,7 @@ public class PurpurWorldConfig {
@@ -1396,6 +1396,7 @@ public class PurpurWorldConfig {
public boolean parrotRidableInWater = false;
public double parrotMaxY = 256D;
public double parrotMaxHealth = 6.0D;
@@ -61,7 +61,7 @@ index 4889ab24ad48fe958e29b634980c69191a7dbd32..3332180fa9489622f4fc94c0906fd1af
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1404,6 +1405,7 @@ public class PurpurWorldConfig {
@@ -1406,6 +1407,7 @@ public class PurpurWorldConfig {
set("mobs.parrot.attributes.max_health", oldValue);
}
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);

6
patches/server/0201-Add-config-change-multiplier-critical-damage-value.patch
View File

@@ -18,10 +18,10 @@ index f4f49b87b615a3c7ef56247896392de93eb1bb0d..dfe78217add616c761ba53fb4999cc65
f += f1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bb350c1bc57ac6dca9901c75464f70da6d0ffaa6..9c28a1cd6c48e0b909e34e30d4d919e1425d093a 100644
index ff35f7077138c42df41ed1df7f195432e46456b2..55e1b691634a387046e16caa9307b76434100d9b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -321,6 +321,7 @@ public class PurpurWorldConfig {
@@ -322,6 +322,7 @@ public class PurpurWorldConfig {
public boolean creativeOnePunch = false;
public boolean playerSleepNearMonsters = false;
public boolean playersSkipNight = true;
@@ -29,7 +29,7 @@ index bb350c1bc57ac6dca9901c75464f70da6d0ffaa6..9c28a1cd6c48e0b909e34e30d4d919e1
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -336,6 +337,7 @@ public class PurpurWorldConfig {
@@ -338,6 +339,7 @@ public class PurpurWorldConfig {
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);

4
patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch
View File

@@ -17,10 +17,10 @@ index 78f51f3dd0e7249af69228479da932e9aea982d6..d9d4421f7f316281487828739168cfd6
BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c28a1cd6c48e0b909e34e30d4d919e1425d093a..33d71c3d9c657ce8ce113eae8f4a8f39b2a65dd8 100644
index 55e1b691634a387046e16caa9307b76434100d9b..f66f8067014252a89914e8e07cc702160b8f189b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -553,6 +553,11 @@ public class PurpurWorldConfig {
@@ -555,6 +555,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0205-ShulkerBox-allow-oversized-stacks.patch
View File

@@ -35,10 +35,10 @@ index b9c558060024d380e89116489c7fc12ad88db8ad..0a0a4be15bed899812fcd4af0e311f5f
CompoundTag compoundTag = shulkerBoxBlockEntity.saveToTag(new CompoundTag());
if (!compoundTag.isEmpty()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 439103c27befdec5e2f41c94d4c3f1346a49725d..525e3f398c2c7b7ea9ececa11705bae33d68dcf2 100644
index f66f8067014252a89914e8e07cc702160b8f189b..189d859477bbb4a732c180ca2a5f8bff2de1eb4e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -671,6 +671,11 @@ public class PurpurWorldConfig {
@@ -673,6 +673,11 @@ public class PurpurWorldConfig {
}
}

6
patches/server/0206-Bee-can-work-when-raining-or-at-night.patch
View File

@@ -31,10 +31,10 @@ index ffacc4b8cc3ab8285c4131aec58e48ffa9e1952e..e0e039e2f614f2df48d8d1b6e8bbbe7a
return false;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 525e3f398c2c7b7ea9ececa11705bae33d68dcf2..d5422db5695ec3f2b9381cdbd936a56865a21830 100644
index 189d859477bbb4a732c180ca2a5f8bff2de1eb4e..571ccc470c88c5b0167bf41b79933282e6a9f893 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -775,6 +775,8 @@ public class PurpurWorldConfig {
@@ -777,6 +777,8 @@ public class PurpurWorldConfig {
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
public int beeBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index 525e3f398c2c7b7ea9ececa11705bae33d68dcf2..d5422db5695ec3f2b9381cdbd936a568
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -786,6 +788,8 @@ public class PurpurWorldConfig {
@@ -788,6 +790,8 @@ public class PurpurWorldConfig {
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);

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