mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: b79bc31 Fix MerchantOffer BuyB Only AssertionError (#6206) d6c81c8 Don't apply cramming damage to players (#5903) 12942dc Add rate options and timings for sensors and behaviors (#6027) fc47872 Use mapped names for sensor and behavior timings/config (#6228) c75a837 Don't expose ASM in API (#6229) c225bf9 Fix book title and author being improperly serialized as components (#6190) f25facb Update email & name (DenWav) 44516b1 [ci skip] Put mappings util in a separate class to the stacktrace deobfuscator
This commit is contained in:
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
|
||||
mcVersion = 1.17.1
|
||||
packageVersion = 1_17_R1
|
||||
|
||||
paperCommit = bc127ea819df17e60ecb76e3cd0abec730422de1
|
||||
paperCommit = 44516b1d8a04b9b93b50d4fdba7298ce84411a10
|
||||
|
||||
org.gradle.parallel = true
|
||||
org.gradle.vfs.watch = false
|
||||
|
||||
@@ -6,14 +6,14 @@ Subject: [PATCH] Build System Changes
|
||||
todo: merge with rebrand patch
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 7ad3e5153718f6d4ce8293a9790bc3c1158aeb8e..309d201b7d551efd4a5903e6d990b0e718af6a78 100644
|
||||
index 15b8f4708887535383bb74bd922f893231737599..8d19658eb77565524f6d36debcb7629db56f04c6 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -29,6 +29,7 @@ dependencies {
|
||||
api("org.ow2.asm:asm:9.0")
|
||||
api("org.ow2.asm:asm-commons:9.0")
|
||||
@@ -27,6 +27,7 @@ dependencies {
|
||||
api("net.kyori:adventure-text-serializer-legacy")
|
||||
api("net.kyori:adventure-text-serializer-plain")
|
||||
api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
|
||||
+ api("net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT") // Purpur
|
||||
|
||||
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
|
||||
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
|
||||
implementation("org.ow2.asm:asm:9.1")
|
||||
implementation("org.ow2.asm:asm-commons:9.1")
|
||||
|
||||
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dfffb5b03ea 100644
|
||||
index b50463c2356301a1b47a0bf4f50dc1f121d363a1..b7e5bdcfe04ab7d8d8d453a787849963640262a5 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -1,10 +1,16 @@
|
||||
@@ -36,8 +36,8 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
|
||||
+import io.papermc.paperweight.util.set
|
||||
import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
|
||||
import java.nio.file.Files
|
||||
import java.text.SimpleDateFormat
|
||||
@@ -30,8 +36,8 @@ repositories {
|
||||
import java.util.Locale
|
||||
@@ -28,8 +34,8 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -48,7 +48,7 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
|
||||
// Paper start
|
||||
implementation("org.jline:jline-terminal-jansi:3.12.1")
|
||||
implementation("net.minecrell:terminalconsoleappender:1.2.0")
|
||||
@@ -81,7 +87,7 @@ tasks.jar {
|
||||
@@ -80,7 +86,7 @@ tasks.jar {
|
||||
attributes(
|
||||
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
||||
"Implementation-Title" to "CraftBukkit",
|
||||
@@ -57,7 +57,7 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
|
||||
"Implementation-Vendor" to date, // Paper
|
||||
"Specification-Title" to "Bukkit",
|
||||
"Specification-Version" to project.version,
|
||||
@@ -106,6 +112,22 @@ publishing {
|
||||
@@ -105,6 +111,22 @@ publishing {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ index 682935762008602ca214f68147766792cbedeea9..8ccb5183af4a10a92d17570833e21dff
|
||||
val generatePom = tasks.named<GenerateMavenPom>("generatePomFileForMavenPublication")
|
||||
|
||||
tasks.shadowJar {
|
||||
@@ -177,7 +199,7 @@ tasks.test {
|
||||
@@ -176,7 +198,7 @@ tasks.test {
|
||||
fun TaskContainer.registerRunTask(
|
||||
name: String, block: JavaExec.() -> Unit
|
||||
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
||||
@@ -3765,7 +3765,7 @@ index 0000000000000000000000000000000000000000..300364f693583be802a71d94cda5d96c
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
index b9cdbf8acccfd6b207a0116f068168f3b8c8e17d..7404989c37ee1b7aa4e6999a063180d099532f7e 100644
|
||||
index fe225310e4b62e7bded3521d3ddf4092c25a3645..76699e10923c72d5ab9884eb89c47a7c209f9817 100644
|
||||
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -45,6 +45,8 @@ public final class MinecraftTimings {
|
||||
@@ -11352,12 +11352,12 @@ index 3dded5c491ace6b073a7bc3178976bd70f0b9393..f25bb4214cffd0050241ea229b6acb0c
|
||||
|
||||
public SystemReport fillSystemReport(SystemReport details) {
|
||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
index 6d7eef79de7a899ccdbc3194d925bb4caa0a4b03..9667a74c9b77ea6acd9d2ebce30c685ed4b53e59 100644
|
||||
index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..1b324839e37d510552f5f5497de009add69ecda5 100644
|
||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
@@ -223,6 +223,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
|
||||
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.getClass(); // load mappings for stacktrace deobf
|
||||
io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
|
||||
// Paper end
|
||||
+ com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
|
||||
|
||||
@@ -13611,7 +13611,7 @@ index c2e0417ee15018ec31c4aa8eec3dff7a0d16aa9e..631bc406d9bb193ac2d1d433519c2c3a
|
||||
|
||||
public void onTrackingStart(Entity entity) {
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 8e2bccc3a9ddb17a4978596056189eb776976338..dcba69c0ad3288ddc64dacc58b6fb857eed3109c 100644
|
||||
index e32da100eabf0d3de12375402e9378c726811358..1c9aec21aa22d0d202a023e9252d1412685ed4b0 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -261,7 +261,7 @@ public class ServerPlayer extends Player {
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 8ccb5183af4a10a92d17570833e21dfffb5b03ea..16f8f8dd9ddc105dde4401fa258207686e64ab3e 100644
|
||||
index b7e5bdcfe04ab7d8d8d453a787849963640262a5..cdae64a1f8a4096865fbaa246a0715f909cf5043 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -36,8 +36,8 @@ repositories {
|
||||
@@ -34,8 +34,8 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -19,7 +19,7 @@ index 8ccb5183af4a10a92d17570833e21dfffb5b03ea..16f8f8dd9ddc105dde4401fa25820768
|
||||
// Paper start
|
||||
implementation("org.jline:jline-terminal-jansi:3.12.1")
|
||||
implementation("net.minecrell:terminalconsoleappender:1.2.0")
|
||||
@@ -67,6 +67,7 @@ dependencies {
|
||||
@@ -66,6 +66,7 @@ dependencies {
|
||||
|
||||
implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
|
||||
implementation("io.netty:netty-all:4.1.65.Final") // Paper
|
||||
@@ -27,7 +27,7 @@ index 8ccb5183af4a10a92d17570833e21dfffb5b03ea..16f8f8dd9ddc105dde4401fa25820768
|
||||
|
||||
implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
|
||||
|
||||
@@ -87,7 +88,7 @@ tasks.jar {
|
||||
@@ -86,7 +87,7 @@ tasks.jar {
|
||||
attributes(
|
||||
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
||||
"Implementation-Title" to "CraftBukkit",
|
||||
@@ -171,7 +171,7 @@ index f25bb4214cffd0050241ea229b6acb0c16b2b0a5..be1bc7fda4104d61f91c2815c6ba3c61
|
||||
|
||||
public SystemReport fillSystemReport(SystemReport details) {
|
||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
index 9667a74c9b77ea6acd9d2ebce30c685ed4b53e59..1749d134260adcb33d1757630c6ba2fdc43d2e6d 100644
|
||||
index 1b324839e37d510552f5f5497de009add69ecda5..6e530a9a2c176b1a9ef00ddd730de069d647859c 100644
|
||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
@@ -282,11 +282,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
|
||||
@@ -80,7 +80,7 @@ index 134bb2a4826419110c10a483834747b942576e58..d9e868b6c70da18b4ce23c80e2aaf347
|
||||
if (this.source.acceptsSuccess() && !this.silent) {
|
||||
this.source.sendMessage(message, Util.NIL_UUID);
|
||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
index 1749d134260adcb33d1757630c6ba2fdc43d2e6d..1b8d836607d52c3bc67ad5f2accbc94663637d49 100644
|
||||
index 6e530a9a2c176b1a9ef00ddd730de069d647859c..fc6a6e88486c5c2dca1b10bfeae24124690d7b8d 100644
|
||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
@@ -219,6 +219,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
@@ -98,7 +98,7 @@ index 1749d134260adcb33d1757630c6ba2fdc43d2e6d..1b8d836607d52c3bc67ad5f2accbc946
|
||||
+ // Purpur end
|
||||
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
|
||||
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
|
||||
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.getClass(); // load mappings for stacktrace deobf
|
||||
io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
|
||||
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||||
index 61a4dea715689b0ce9247040db5dd2080ee2e167..ffe76b8afd2a2c3153751c73ee7bbf4c9351e12c 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Silk touch spawners
|
||||
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
|
||||
index d24c569f00786b2bde953429aad57025abee72d6..44d837f624e2a23b0412cca4c0646f489c79d34f 100644
|
||||
index f63b80a1120b2bf5f77f1c1edb928309a1272f79..363f94e86e3349d9ed03b692e136307fe9fa5e28 100644
|
||||
--- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
|
||||
+++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
|
||||
@@ -79,6 +79,7 @@ public final class PaperAdventure {
|
||||
@@ -80,6 +80,7 @@ public final class PaperAdventure {
|
||||
})
|
||||
.build();
|
||||
public static final LegacyComponentSerializer LEGACY_SECTION_UXRC = LegacyComponentSerializer.builder().flattener(FLATTENER).hexColors().useUnusualXRepeatedCharacterHexFormat().build();
|
||||
|
||||
@@ -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 5fd8eb62a249987cfe9e232724f58dd44a7e4837..cb86a58f96c8d9b91c69603dbd507fcb81a45cfd 100644
|
||||
index 85c6d25580ebcb885e82b21bdac5330583825430..9c6314e42ac283eed107c238d954c0dfed424b24 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -203,8 +203,10 @@ public class PurpurWorldConfig {
|
||||
@@ -201,8 +201,10 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
@@ -1,39 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sun, 21 Jul 2019 18:01:46 -0500
|
||||
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 394da2bb29809477351da3cb782bf5b8e3aadc3b..c5618b6231ffcb711cf9e2b2d6b739e42ecba7fd 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -1438,7 +1438,7 @@ public class ServerPlayer extends Player {
|
||||
|
||||
@Override
|
||||
public boolean isInvulnerableTo(DamageSource damageSource) {
|
||||
- return super.isInvulnerableTo(damageSource) || this.isChangingDimension() || this.getAbilities().invulnerable && damageSource == DamageSource.WITHER;
|
||||
+ 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 85c6d25580ebcb885e82b21bdac5330583825430..5fd8eb62a249987cfe9e232724f58dd44a7e4837 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -166,6 +166,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);
|
||||
@@ -173,6 +174,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;
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index a12fcb4be21f32933cee916c863d6637ad87ef15..8197ad7db6ec1a750b732e597af75f41ab056778 100644
|
||||
index 1d6e063e1cf5435b123d5789d7fcf03503cc0821..46b6e0fcf662472b7fcccc33f859c5e33340d7bb 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -1735,6 +1735,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
@@ -17,7 +17,7 @@ index a12fcb4be21f32933cee916c863d6637ad87ef15..8197ad7db6ec1a750b732e597af75f41
|
||||
|
||||
public void absMoveTo(double x, double y, double z) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index a88b37884e564303a86422cf50faadaf41b9d3f3..df6e71ee5b151b0b319defb4b9fd10858ff03bbd 100644
|
||||
index 172f7746a93afa1ee7990eeab1d3da2fc210aa99..31f3767c7d9e9fc5f3bd91c7ec163bce8ada64db 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -2883,7 +2883,7 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Skip events if there's no listeners
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
|
||||
index ff4f48f6646060b398e8bf90a078e7fbf84beada..d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb 100644
|
||||
index a6f10d47bc4e2cadcc3e06cffa011ed7fb97c68d..59881c845cc88508736cc3d2a61860512d28964d 100644
|
||||
--- a/src/main/java/net/minecraft/commands/Commands.java
|
||||
+++ b/src/main/java/net/minecraft/commands/Commands.java
|
||||
@@ -375,6 +375,7 @@ public class Commands {
|
||||
@@ -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 cb86a58f96c8d9b91c69603dbd507fcb81a45cfd..cb44ee2bb42963d9adb8abb813a27fa18670a02e 100644
|
||||
index 9c6314e42ac283eed107c238d954c0dfed424b24..72a8880827607bc727806b0c677eb48376835cf2 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -204,9 +204,11 @@ public class PurpurWorldConfig {
|
||||
@@ -202,9 +202,11 @@ public class PurpurWorldConfig {
|
||||
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
public boolean milkCuresBadOmen = true;
|
||||
@@ -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 cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40045b6b04 100644
|
||||
index 72a8880827607bc727806b0c677eb48376835cf2..a5fd10b8a1464fdc22c070df4f0387e6e796b25c 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -376,6 +376,7 @@ public class PurpurWorldConfig {
|
||||
@@ -374,6 +374,7 @@ public class PurpurWorldConfig {
|
||||
public boolean creeperRidableInWater = false;
|
||||
public double creeperMaxHealth = 20.0D;
|
||||
public double creeperChargedChance = 0.0D;
|
||||
@@ -49,7 +49,7 @@ index cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40
|
||||
private void creeperSettings() {
|
||||
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
|
||||
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
|
||||
@@ -386,6 +387,7 @@ public class PurpurWorldConfig {
|
||||
@@ -384,6 +385,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 cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40
|
||||
}
|
||||
|
||||
public boolean dolphinRidable = false;
|
||||
@@ -483,6 +485,7 @@ public class PurpurWorldConfig {
|
||||
@@ -481,6 +483,7 @@ public class PurpurWorldConfig {
|
||||
public boolean endermanRidable = false;
|
||||
public boolean endermanRidableInWater = false;
|
||||
public double endermanMaxHealth = 40.0D;
|
||||
@@ -65,7 +65,7 @@ index cb44ee2bb42963d9adb8abb813a27fa18670a02e..38b94f99f6c45f3144f7b262e5cc2b40
|
||||
private void endermanSettings() {
|
||||
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
|
||||
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
|
||||
@@ -492,6 +495,7 @@ public class PurpurWorldConfig {
|
||||
@@ -490,6 +493,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.enderman.attributes.max_health", oldValue);
|
||||
}
|
||||
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
|
||||
@@ -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 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41c3c46c17 100644
|
||||
index a5fd10b8a1464fdc22c070df4f0387e6e796b25c..79992f590de1b122ef7be4ed2f3c7385f3ca8a7d 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1235,6 +1235,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1233,6 +1233,7 @@ public class PurpurWorldConfig {
|
||||
public double villagerMaxHealth = 20.0D;
|
||||
public int villagerBrainTicks = 1;
|
||||
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
|
||||
@@ -52,7 +52,7 @@ index 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1246,6 +1247,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1244,6 +1245,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 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41
|
||||
}
|
||||
|
||||
public boolean vindicatorRidable = false;
|
||||
@@ -1265,6 +1267,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1263,6 +1265,7 @@ public class PurpurWorldConfig {
|
||||
public boolean wanderingTraderRidable = false;
|
||||
public boolean wanderingTraderRidableInWater = false;
|
||||
public double wanderingTraderMaxHealth = 20.0D;
|
||||
@@ -68,7 +68,7 @@ index 38b94f99f6c45f3144f7b262e5cc2b40045b6b04..d1dc534309146d6fead7881dd669dc41
|
||||
private void wanderingTraderSettings() {
|
||||
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
|
||||
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
|
||||
@@ -1274,6 +1277,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1272,6 +1275,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wandering_trader.attributes.max_health", oldValue);
|
||||
}
|
||||
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
|
||||
@@ -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 d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f3da30d20 100644
|
||||
index 79992f590de1b122ef7be4ed2f3c7385f3ca8a7d..7fb7fdd26a84e13fd9a8368397fe7d2c7ced12b8 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1236,6 +1236,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1234,6 +1234,7 @@ public class PurpurWorldConfig {
|
||||
public int villagerBrainTicks = 1;
|
||||
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
|
||||
public boolean villagerFollowEmeraldBlock = false;
|
||||
@@ -60,7 +60,7 @@ index d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1248,6 +1249,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1246,6 +1247,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 d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f
|
||||
}
|
||||
|
||||
public boolean vindicatorRidable = false;
|
||||
@@ -1268,6 +1270,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1266,6 +1268,7 @@ public class PurpurWorldConfig {
|
||||
public boolean wanderingTraderRidableInWater = false;
|
||||
public double wanderingTraderMaxHealth = 20.0D;
|
||||
public boolean wanderingTraderFollowEmeraldBlock = false;
|
||||
@@ -76,7 +76,7 @@ index d1dc534309146d6fead7881dd669dc41c3c46c17..04ad7b73d2a482abe9bfe9b100950e6f
|
||||
private void wanderingTraderSettings() {
|
||||
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
|
||||
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
|
||||
@@ -1278,6 +1281,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1276,6 +1279,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
|
||||
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
|
||||
@@ -18,10 +18,10 @@ index 0c6583751e75d175338aaf411fb26baa1946a9b4..bad3b9eb0ab8612f9c80c52caff38ffe
|
||||
|
||||
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 04ad7b73d2a482abe9bfe9b100950e6f3da30d20..b37d922ba6082f21057b924e1184a81371a50840 100644
|
||||
index 7fb7fdd26a84e13fd9a8368397fe7d2c7ced12b8..cd2f74fe19ab8c22d0bee93787c45a45d1c7b15c 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1237,6 +1237,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1235,6 +1235,8 @@ public class PurpurWorldConfig {
|
||||
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
|
||||
public boolean villagerFollowEmeraldBlock = false;
|
||||
public boolean villagerCanBeLeashed = false;
|
||||
@@ -30,7 +30,7 @@ index 04ad7b73d2a482abe9bfe9b100950e6f3da30d20..b37d922ba6082f21057b924e1184a813
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1250,6 +1252,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1248,6 +1250,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);
|
||||
@@ -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 b37d922ba6082f21057b924e1184a81371a50840..ef1be8d744283b74ff09c0d5badaed77c31e004a 100644
|
||||
index cd2f74fe19ab8c22d0bee93787c45a45d1c7b15c..a75d3ac8c04b9ca81547bcb8d8488f0a4cc1e05b 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -216,6 +216,13 @@ public class PurpurWorldConfig {
|
||||
@@ -214,6 +214,13 @@ public class PurpurWorldConfig {
|
||||
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
|
||||
}
|
||||
|
||||
@@ -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 ef1be8d744283b74ff09c0d5badaed77c31e004a..6ae6000856817e3951e01980d68ea359078886ed 100644
|
||||
index a75d3ac8c04b9ca81547bcb8d8488f0a4cc1e05b..8e2d401e10c2fc7e748fd28073d94f09d228e445 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -218,9 +218,13 @@ public class PurpurWorldConfig {
|
||||
@@ -216,9 +216,13 @@ public class PurpurWorldConfig {
|
||||
|
||||
public boolean lavaInfinite = false;
|
||||
public int lavaInfiniteRequiredSources = 2;
|
||||
@@ -31,22 +31,22 @@ index d6b610a848f37db24af9b219be2f22aeaf892388..52d43c2bf1fa1bfa97aab02a9837c6b1
|
||||
return 0;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 6ae6000856817e3951e01980d68ea359078886ed..ac018249cdb97c679d5a48fcd6d6142228940d85 100644
|
||||
index 8e2d401e10c2fc7e748fd28073d94f09d228e445..d3aa93b934972758c50bd89ba951c5e2f54251a5 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -167,6 +167,8 @@ public class PurpurWorldConfig {
|
||||
@@ -166,6 +166,8 @@ public class PurpurWorldConfig {
|
||||
public boolean idleTimeoutUpdateTabList = false;
|
||||
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);
|
||||
@@ -175,6 +177,8 @@ public class PurpurWorldConfig {
|
||||
@@ -173,6 +175,8 @@ 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);
|
||||
+ playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
|
||||
+ playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
|
||||
}
|
||||
@@ -31,10 +31,10 @@ index 31f3767c7d9e9fc5f3bd91c7ec163bce8ada64db..8f550154b12521662889bbc91f5cd8e2
|
||||
|
||||
protected void updateSwingTime() {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ac018249cdb97c679d5a48fcd6d6142228940d85..7fb6bedf494add10b2b5cc849f89f87b12821b94 100644
|
||||
index d3aa93b934972758c50bd89ba951c5e2f54251a5..f50bbee171ec14c5f574a58f4ac50a96751c0a28 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -209,10 +209,14 @@ public class PurpurWorldConfig {
|
||||
@@ -207,10 +207,14 @@ public class PurpurWorldConfig {
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
public boolean milkCuresBadOmen = true;
|
||||
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
||||
@@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..dba3b8e0671ee63ff077155a8964f3e2
|
||||
// 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 7fb6bedf494add10b2b5cc849f89f87b12821b94..78af09318d961ef8355e0c92f7a572d4d9a572b3 100644
|
||||
index f50bbee171ec14c5f574a58f4ac50a96751c0a28..173d8eb4a1baffb2802dcf82dd2aad5a48a4cd9e 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -219,6 +219,11 @@ public class PurpurWorldConfig {
|
||||
@@ -217,6 +217,11 @@ public class PurpurWorldConfig {
|
||||
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
|
||||
}
|
||||
|
||||
@@ -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 78af09318d961ef8355e0c92f7a572d4d9a572b3..b022574dca704f93df22bef22d26f1cdc4ec4e20 100644
|
||||
index 173d8eb4a1baffb2802dcf82dd2aad5a48a4cd9e..0db73ef0552263437ba87281a179d1643b42cd83 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -206,12 +206,14 @@ public class PurpurWorldConfig {
|
||||
@@ -204,12 +204,14 @@ public class PurpurWorldConfig {
|
||||
});
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ index 1caf10ecf949e0f465ffe573f3bed1a3c5733a7f..8b6614bde99b17db2e161f3fe4ab2491
|
||||
if (entry != null) {
|
||||
ItemStack itemstack = (ItemStack) entry.getValue();
|
||||
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
index 86aa07827ce0e02939ebb594956b1023ffd83ad4..e2cc529405d80f4e8f22117da98ee6474351c218 100644
|
||||
index ae6638e44b5562436e8d3ad89167663c6f3961b1..9106d48e1ffab9687cd3295d9bb0410cdf875df4 100644
|
||||
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
@@ -511,6 +511,16 @@ public final class ItemStack {
|
||||
@@ -73,10 +73,10 @@ index d439e8ce87bf7da03683a336941c7673b8b166e4..955e482e4bc83f2b777cd2e4254c40be
|
||||
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 b022574dca704f93df22bef22d26f1cdc4ec4e20..47f3934b297d8cdf1d5983a66b8542854e38e3a5 100644
|
||||
index 0db73ef0552263437ba87281a179d1643b42cd83..996346851c4b3ce181b1ae5431bea693d04b923f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -206,6 +206,7 @@ public class PurpurWorldConfig {
|
||||
@@ -204,6 +204,7 @@ public class PurpurWorldConfig {
|
||||
});
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ index b022574dca704f93df22bef22d26f1cdc4ec4e20..47f3934b297d8cdf1d5983a66b854285
|
||||
public boolean boatEjectPlayersOnLand = false;
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
public boolean milkCuresBadOmen = true;
|
||||
@@ -213,6 +214,7 @@ public class PurpurWorldConfig {
|
||||
@@ -211,6 +212,7 @@ public class PurpurWorldConfig {
|
||||
public double voidDamageHeight = -64.0D;
|
||||
public double voidDamageDealt = 4.0D;
|
||||
private void miscGameplayMechanicsSettings() {
|
||||
@@ -69,7 +69,7 @@ index c96feac8afa0e0ea05513692d1e937ae7cbecd66..214b25f57f15e2127b92ec88117c36d4
|
||||
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
|
||||
tickSection = curTime;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 0c63bb38dd3e088fd4e5d232713c86649f77e9c9..a16f8d1c1faa5bc69a6ea5165f5e44d7e6ae35f5 100644
|
||||
index cbf3817adb3c4a0dd818898f886d21e74d662a47..ef1004a277e4ae0bdec410c42271b4060227313f 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
|
||||
@@ -54,7 +54,7 @@ index 543a08f920319a2547258640bafebb1e70af65c4..dd211aa7c4ef1e158933a89898b9e5bc
|
||||
itemStack.shrink(1);
|
||||
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
||||
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
index e2cc529405d80f4e8f22117da98ee6474351c218..18da9a82fb2ca4b9b8d80e37df29c76c8214c37f 100644
|
||||
index 9106d48e1ffab9687cd3295d9bb0410cdf875df4..1ecc0b740758c878a5a196524fbaa238b6689ac5 100644
|
||||
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
@@ -540,7 +540,7 @@ public final class ItemStack {
|
||||
@@ -99,7 +99,7 @@ index 510ed67a7de2b503ab8b01db57ed09ee33b0d825..3f53dc8f250ad3f7616ce7ef0a2353ca
|
||||
entityhuman.startAutoSpinAttack(20);
|
||||
if (entityhuman.isOnGround()) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 47f3934b297d8cdf1d5983a66b8542854e38e3a5..e4ba096aea461c4fcdcb50f2343eaf4feb3027b6 100644
|
||||
index 996346851c4b3ce181b1ae5431bea693d04b923f..c54e3fe327a677e622b2a6b300c8e6fe72d13ca6 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -98,6 +98,19 @@ public class PurpurWorldConfig {
|
||||
@@ -94,7 +94,7 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index e4ba096aea461c4fcdcb50f2343eaf4feb3027b6..d4f79d0132122fc8f039f08db6f1f262e50c6d3e 100644
|
||||
index c54e3fe327a677e622b2a6b300c8e6fe72d13ca6..6bca783ce69f503f4ff192d2c406b2126c5d4d4a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -111,6 +111,49 @@ public class PurpurWorldConfig {
|
||||
@@ -167,10 +167,10 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598ca1f779a 100644
|
||||
index 6bca783ce69f503f4ff192d2c406b2126c5d4d4a..0aa486b5af62df7e0bfe394ff9c1970439776b63 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -520,6 +520,9 @@ public class PurpurWorldConfig {
|
||||
@@ -518,6 +518,9 @@ public class PurpurWorldConfig {
|
||||
public boolean drownedRidableInWater = false;
|
||||
public double drownedMaxHealth = 20.0D;
|
||||
public double drownedSpawnReinforcements = 0.1D;
|
||||
@@ -180,7 +180,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
private void drownedSettings() {
|
||||
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
|
||||
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
|
||||
@@ -530,6 +533,9 @@ public class PurpurWorldConfig {
|
||||
@@ -528,6 +531,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 d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
}
|
||||
|
||||
public boolean elderGuardianRidable = false;
|
||||
@@ -742,6 +748,9 @@ public class PurpurWorldConfig {
|
||||
@@ -740,6 +746,9 @@ public class PurpurWorldConfig {
|
||||
public boolean huskRidableInWater = false;
|
||||
public double huskMaxHealth = 20.0D;
|
||||
public double huskSpawnReinforcements = 0.1D;
|
||||
@@ -200,7 +200,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
private void huskSettings() {
|
||||
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
|
||||
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
|
||||
@@ -752,6 +761,9 @@ public class PurpurWorldConfig {
|
||||
@@ -750,6 +759,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 d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
}
|
||||
|
||||
public boolean illusionerRidable = false;
|
||||
@@ -1452,6 +1464,9 @@ public class PurpurWorldConfig {
|
||||
@@ -1450,6 +1462,9 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieRidableInWater = false;
|
||||
public double zombieMaxHealth = 20.0D;
|
||||
public double zombieSpawnReinforcements = 0.1D;
|
||||
@@ -220,7 +220,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
private void zombieSettings() {
|
||||
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
|
||||
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
|
||||
@@ -1462,6 +1477,9 @@ public class PurpurWorldConfig {
|
||||
@@ -1460,6 +1475,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 d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
}
|
||||
|
||||
public boolean zombieHorseRidableInWater = false;
|
||||
@@ -1495,6 +1513,9 @@ public class PurpurWorldConfig {
|
||||
@@ -1493,6 +1511,9 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieVillagerRidableInWater = false;
|
||||
public double zombieVillagerMaxHealth = 20.0D;
|
||||
public double zombieVillagerSpawnReinforcements = 0.1D;
|
||||
@@ -240,7 +240,7 @@ index d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
private void zombieVillagerSettings() {
|
||||
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
|
||||
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
|
||||
@@ -1505,12 +1526,18 @@ public class PurpurWorldConfig {
|
||||
@@ -1503,12 +1524,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 d4f79d0132122fc8f039f08db6f1f262e50c6d3e..f1f9ed6311b69d8c1a2e439f76496598
|
||||
private void zombifiedPiglinSettings() {
|
||||
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
|
||||
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
|
||||
@@ -1521,5 +1548,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1519,5 +1546,8 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
|
||||
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);
|
||||
@@ -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 f1f9ed6311b69d8c1a2e439f76496598ca1f779a..8ce8fa59d89a50f9afc3808b8521d76da76f8ad0 100644
|
||||
index 0aa486b5af62df7e0bfe394ff9c1970439776b63..2bc0bab30ccf67fce236dcf74593d67c57ec13ff 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -933,6 +933,9 @@ public class PurpurWorldConfig {
|
||||
@@ -931,6 +931,9 @@ public class PurpurWorldConfig {
|
||||
public int phantomFlameFireTime = 8;
|
||||
public boolean phantomAllowGriefing = false;
|
||||
public double phantomMaxHealth = 20.0D;
|
||||
@@ -271,7 +271,7 @@ index f1f9ed6311b69d8c1a2e439f76496598ca1f779a..8ce8fa59d89a50f9afc3808b8521d76d
|
||||
private void phantomSettings() {
|
||||
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
|
||||
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
|
||||
@@ -946,6 +949,9 @@ public class PurpurWorldConfig {
|
||||
@@ -944,6 +947,9 @@ public class PurpurWorldConfig {
|
||||
set("mobs.phantom.attributes.max_health", oldValue);
|
||||
}
|
||||
phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);
|
||||
@@ -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 8ce8fa59d89a50f9afc3808b8521d76da76f8ad0..0f192f2f487a16fd881aee9bc66198aa514167d7 100644
|
||||
index 2bc0bab30ccf67fce236dcf74593d67c57ec13ff..5004f8879909c6b226ab3ce6a60fee0113b67de6 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -936,6 +936,18 @@ public class PurpurWorldConfig {
|
||||
@@ -934,6 +934,18 @@ public class PurpurWorldConfig {
|
||||
public double phantomAttackedByCrystalRadius = 0.0D;
|
||||
public float phantomAttackedByCrystalDamage = 1.0F;
|
||||
public double phantomOrbitCrystalRadius = 0.0D;
|
||||
@@ -70,7 +70,7 @@ index 8ce8fa59d89a50f9afc3808b8521d76da76f8ad0..0f192f2f487a16fd881aee9bc66198aa
|
||||
private void phantomSettings() {
|
||||
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
|
||||
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
|
||||
@@ -952,6 +964,18 @@ public class PurpurWorldConfig {
|
||||
@@ -950,6 +962,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);
|
||||
@@ -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 0f192f2f487a16fd881aee9bc66198aa514167d7..ecd50e72600cdec834c57570565bc5f19faaecb0 100644
|
||||
index 5004f8879909c6b226ab3ce6a60fee0113b67de6..c10c8b0d6f622bafca3db6b58dd8525310d0ba31 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -279,6 +279,22 @@ public class PurpurWorldConfig {
|
||||
@@ -277,6 +277,22 @@ public class PurpurWorldConfig {
|
||||
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
|
||||
}
|
||||
|
||||
@@ -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 ecd50e72600cdec834c57570565bc5f19faaecb0..091aa1b404a8d8b2f71501d3a3425c2e56114829 100644
|
||||
index c10c8b0d6f622bafca3db6b58dd8525310d0ba31..93fb8838b802476ab184f17e9fc880cd64de9f41 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -316,6 +316,22 @@ public class PurpurWorldConfig {
|
||||
@@ -314,6 +314,22 @@ public class PurpurWorldConfig {
|
||||
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 0be0d27e2534fccf0f8ff828476e2a0612c60d71..a1687fe41480048a1d98fda8c5b704d874c47708 100644
|
||||
index 0fbf66540e6beee964096a8f2a0312509449ff14..547572a579c434055956eab627195dbb5e5d4fa8 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -1200,13 +1200,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -89,7 +89,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..ea53ece9afe9e35323a88647901a83a4
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 091aa1b404a8d8b2f71501d3a3425c2e56114829..591aabe5c297bcecdb23c7c901c6e9737369d119 100644
|
||||
index 93fb8838b802476ab184f17e9fc880cd64de9f41..786415c28dc7d8b601410b10d9257419481e1065 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -111,6 +111,11 @@ public class PurpurWorldConfig {
|
||||
@@ -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 c5618b6231ffcb711cf9e2b2d6b739e42ecba7fd..e57e8e7553d41af9686283b74cc01791a76c5b0e 100644
|
||||
index 92be3472f97a8d3e916af198c1278773aa1b7d3a..074abae3d83c3f170b1d4e5134a204c7acdc49bc 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -2490,5 +2490,25 @@ public class ServerPlayer extends Player {
|
||||
@@ -55,19 +55,19 @@ index f1a8b91f620152a3da3c11769c3c2353ccdba3cf..0c14ccc74abcc68ecc5422b38bc729dc
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 591aabe5c297bcecdb23c7c901c6e9737369d119..2c16ac45f3a5589ad2dac6e40dfa4dfd593486fe 100644
|
||||
index 786415c28dc7d8b601410b10d9257419481e1065..1df372f35183fd45c69a20233b194b6a09a13861 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -230,6 +230,7 @@ public class PurpurWorldConfig {
|
||||
public boolean playersShouldCramToDeath = true;
|
||||
@@ -229,6 +229,7 @@ public class PurpurWorldConfig {
|
||||
public boolean playerInvulnerableWhileAcceptingResourcePack = false;
|
||||
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);
|
||||
@@ -240,6 +241,7 @@ public class PurpurWorldConfig {
|
||||
playersShouldCramToDeath = getBoolean("gameplay-mechanics.player.should-cram-to-death", playersShouldCramToDeath);
|
||||
@@ -238,6 +239,7 @@ public class PurpurWorldConfig {
|
||||
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
|
||||
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);
|
||||
@@ -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 2c16ac45f3a5589ad2dac6e40dfa4dfd593486fe..d1e5cbb239b043aade27d5e6e058a91241cce65a 100644
|
||||
index 1df372f35183fd45c69a20233b194b6a09a13861..5d91ae6b45f598df7402db420f451a8b1e9cfb39 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1269,6 +1269,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1267,6 +1267,7 @@ public class PurpurWorldConfig {
|
||||
|
||||
public boolean squidRidable = false;
|
||||
public double squidMaxHealth = 10.0D;
|
||||
@@ -16,7 +16,7 @@ index 2c16ac45f3a5589ad2dac6e40dfa4dfd593486fe..d1e5cbb239b043aade27d5e6e058a912
|
||||
private void squidSettings() {
|
||||
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -1277,6 +1278,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1275,6 +1276,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.squid.attributes.max_health", oldValue);
|
||||
}
|
||||
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
|
||||
@@ -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 d1e5cbb239b043aade27d5e6e058a91241cce65a..0c69310177c648357486ab18b3921e4c49041590 100644
|
||||
index 5d91ae6b45f598df7402db420f451a8b1e9cfb39..de92cd0eb830f6787f4d5b31b66543b332f0d8e8 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -987,6 +987,9 @@ public class PurpurWorldConfig {
|
||||
@@ -985,6 +985,9 @@ public class PurpurWorldConfig {
|
||||
public int phantomSpawnOverheadRadius = 10;
|
||||
public int phantomSpawnMinPerAttempt = 1;
|
||||
public int phantomSpawnMaxPerAttempt = -1;
|
||||
@@ -60,7 +60,7 @@ index d1e5cbb239b043aade27d5e6e058a91241cce65a..0c69310177c648357486ab18b3921e4c
|
||||
private void phantomSettings() {
|
||||
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
|
||||
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
|
||||
@@ -1015,6 +1018,9 @@ public class PurpurWorldConfig {
|
||||
@@ -1013,6 +1016,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);
|
||||
@@ -18,10 +18,10 @@ index bad3b9eb0ab8612f9c80c52caff38ffe791d112c..4752205ab570ab8f6ae7f0a15ae610b6
|
||||
|
||||
private boolean hungry() {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 0c69310177c648357486ab18b3921e4c49041590..1556c9a9f99078eb970993aa90e96313acb71e09 100644
|
||||
index de92cd0eb830f6787f4d5b31b66543b332f0d8e8..8b164645a22e60980c036ac272e8b77b11de7b86 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1412,6 +1412,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1410,6 +1410,7 @@ public class PurpurWorldConfig {
|
||||
public boolean villagerCanBeLeashed = false;
|
||||
public int villagerSpawnIronGolemRadius = 0;
|
||||
public int villagerSpawnIronGolemLimit = 0;
|
||||
@@ -29,7 +29,7 @@ index 0c69310177c648357486ab18b3921e4c49041590..1556c9a9f99078eb970993aa90e96313
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1427,6 +1428,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1425,6 +1426,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);
|
||||
@@ -17,10 +17,10 @@ index c601b8b12756682a4cb300be8ebed4319902c5b5..eec88d3947d435559d8ce175f72c5efb
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 1556c9a9f99078eb970993aa90e96313acb71e09..341bb1676190ccf67b1dce42e3e5aed97dc9bef8 100644
|
||||
index 8b164645a22e60980c036ac272e8b77b11de7b86..79e193fbf4e8f6cf42496f09debf88ccc99bf11b 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -346,6 +346,11 @@ public class PurpurWorldConfig {
|
||||
@@ -344,6 +344,11 @@ public class PurpurWorldConfig {
|
||||
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
|
||||
}
|
||||
|
||||
@@ -29,10 +29,10 @@ index 0c14ccc74abcc68ecc5422b38bc729dc659b9b8b..b909eeba0539ab133e274a15b0b479b5
|
||||
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 341bb1676190ccf67b1dce42e3e5aed97dc9bef8..58c1f069281866488f0b83f2c6c2de715b7ff98c 100644
|
||||
index 79e193fbf4e8f6cf42496f09debf88ccc99bf11b..8255fd95f0bfb45b3f2f714b0f624c12ff33a4a5 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -231,6 +231,7 @@ public class PurpurWorldConfig {
|
||||
@@ -230,6 +230,7 @@ public class PurpurWorldConfig {
|
||||
public String playerDeathExpDropEquation = "expLevel * 7";
|
||||
public int playerDeathExpDropMax = 100;
|
||||
public boolean teleportIfOutsideBorder = false;
|
||||
@@ -40,7 +40,7 @@ index 341bb1676190ccf67b1dce42e3e5aed97dc9bef8..58c1f069281866488f0b83f2c6c2de71
|
||||
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);
|
||||
@@ -242,6 +243,7 @@ public class PurpurWorldConfig {
|
||||
@@ -240,6 +241,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);
|
||||
@@ -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 58c1f069281866488f0b83f2c6c2de715b7ff98c..cd05aad2e21d37e2e75866d061256e881f6b124a 100644
|
||||
index 8255fd95f0bfb45b3f2f714b0f624c12ff33a4a5..097ae958a8c2b2d8cd4ab9d758ddc1359fa91d0a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1441,6 +1441,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1439,6 +1439,7 @@ public class PurpurWorldConfig {
|
||||
public boolean vindicatorRidable = false;
|
||||
public boolean vindicatorRidableInWater = false;
|
||||
public double vindicatorMaxHealth = 24.0D;
|
||||
@@ -41,7 +41,7 @@ index 58c1f069281866488f0b83f2c6c2de715b7ff98c..cd05aad2e21d37e2e75866d061256e88
|
||||
private void vindicatorSettings() {
|
||||
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
|
||||
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
|
||||
@@ -1450,6 +1451,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1448,6 +1449,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.vindicator.attributes.max_health", oldValue);
|
||||
}
|
||||
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
|
||||
@@ -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 cd05aad2e21d37e2e75866d061256e881f6b124a..fee446ecacad393f8e7dcd56fbcabfb6e15bb0f6 100644
|
||||
index 097ae958a8c2b2d8cd4ab9d758ddc1359fa91d0a..b36000b78370c6bb8678dc22a006b4baad22080a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -305,8 +305,10 @@ public class PurpurWorldConfig {
|
||||
@@ -303,8 +303,10 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
|
||||
public boolean dispenserApplyCursedArmor = true;
|
||||
@@ -37,10 +37,10 @@ index ddfb89d62d2ec316683e9f0f5550e298ab26d137..410ac71efff92dfa1f1e11895d0f5bf3
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index fee446ecacad393f8e7dcd56fbcabfb6e15bb0f6..40e4b8ae6a3347203dff7af4fc99e53ba752cf91 100644
|
||||
index b36000b78370c6bb8678dc22a006b4baad22080a..f72e9dfc464a3d79ed6a37d52da0acc097adc0ba 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -288,6 +288,11 @@ public class PurpurWorldConfig {
|
||||
@@ -286,6 +286,11 @@ public class PurpurWorldConfig {
|
||||
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
|
||||
}
|
||||
|
||||
@@ -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 40e4b8ae6a3347203dff7af4fc99e53ba752cf91..a418801c944abe432f083dc77c60ce479ac3e7c8 100644
|
||||
index f72e9dfc464a3d79ed6a37d52da0acc097adc0ba..52401f529231706188415417d9b5f93bc73de983 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -288,6 +288,28 @@ public class PurpurWorldConfig {
|
||||
@@ -286,6 +286,28 @@ public class PurpurWorldConfig {
|
||||
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
|
||||
}
|
||||
|
||||
@@ -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 a418801c944abe432f083dc77c60ce479ac3e7c8..329d5badbe340f9473d370b99b844dd6e7288f70 100644
|
||||
index 52401f529231706188415417d9b5f93bc73de983..102d88156ac24a8a41bbbabb6ad450a8d1e7a9bf 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -554,6 +554,7 @@ public class PurpurWorldConfig {
|
||||
@@ -552,6 +552,7 @@ public class PurpurWorldConfig {
|
||||
public float dolphinSpitSpeed = 1.0F;
|
||||
public float dolphinSpitDamage = 2.0F;
|
||||
public double dolphinMaxHealth = 10.0D;
|
||||
@@ -28,7 +28,7 @@ index a418801c944abe432f083dc77c60ce479ac3e7c8..329d5badbe340f9473d370b99b844dd6
|
||||
private void dolphinSettings() {
|
||||
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
|
||||
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
|
||||
@@ -565,6 +566,7 @@ public class PurpurWorldConfig {
|
||||
@@ -563,6 +564,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.dolphin.attributes.max_health", oldValue);
|
||||
}
|
||||
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
|
||||
@@ -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 329d5badbe340f9473d370b99b844dd6e7288f70..e79e9037fba32c9904583e6b2c7980faf0c2eae9 100644
|
||||
index 102d88156ac24a8a41bbbabb6ad450a8d1e7a9bf..4ff6aaeb9238326f650f98ead61deecc4ae47265 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1314,6 +1314,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1312,6 +1312,7 @@ public class PurpurWorldConfig {
|
||||
public boolean squidRidable = false;
|
||||
public double squidMaxHealth = 10.0D;
|
||||
public boolean squidImmuneToEAR = true;
|
||||
@@ -71,7 +71,7 @@ index 329d5badbe340f9473d370b99b844dd6e7288f70..e79e9037fba32c9904583e6b2c7980fa
|
||||
private void squidSettings() {
|
||||
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -1323,6 +1324,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1321,6 +1322,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
|
||||
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
|
||||
@@ -27,10 +27,10 @@ index c5a1e46cc01e0f296a02536e70dc1443bb23a26f..63ab08c00048feba74e4b3c25308ee75
|
||||
|
||||
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 e79e9037fba32c9904583e6b2c7980faf0c2eae9..c50c21d3bb03c6f7ba87cfea4a28bf9b1a5c3c76 100644
|
||||
index 4ff6aaeb9238326f650f98ead61deecc4ae47265..ce3e424ef0933d80b23eb5a1762d55a9e69280f1 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -274,6 +274,7 @@ public class PurpurWorldConfig {
|
||||
@@ -272,6 +272,7 @@ public class PurpurWorldConfig {
|
||||
public boolean useBetterMending = false;
|
||||
public boolean boatEjectPlayersOnLand = false;
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
@@ -38,7 +38,7 @@ index e79e9037fba32c9904583e6b2c7980faf0c2eae9..c50c21d3bb03c6f7ba87cfea4a28bf9b
|
||||
public boolean milkCuresBadOmen = true;
|
||||
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
||||
public double voidDamageHeight = -64.0D;
|
||||
@@ -282,6 +283,7 @@ public class PurpurWorldConfig {
|
||||
@@ -280,6 +281,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);
|
||||
@@ -23,10 +23,10 @@ index 12cd1b453150e098975c34e00ec9277ff9730c75..ee13bdfb5cfc9992d26126804c0a0bb5
|
||||
|
||||
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 c50c21d3bb03c6f7ba87cfea4a28bf9b1a5c3c76..dc7bba566ec321f645848c734ab00a627e85bcb8 100644
|
||||
index ce3e424ef0933d80b23eb5a1762d55a9e69280f1..a2612c026ae87995881cb339f4d3481a3274c509 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1525,6 +1525,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1523,6 +1523,8 @@ public class PurpurWorldConfig {
|
||||
public boolean witherRidableInWater = false;
|
||||
public double witherMaxY = 256D;
|
||||
public double witherMaxHealth = 300.0D;
|
||||
@@ -35,7 +35,7 @@ index c50c21d3bb03c6f7ba87cfea4a28bf9b1a5c3c76..dc7bba566ec321f645848c734ab00a62
|
||||
private void witherSettings() {
|
||||
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
|
||||
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
|
||||
@@ -1539,6 +1541,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1537,6 +1539,8 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wither.attributes.max_health", oldValue);
|
||||
}
|
||||
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
|
||||
@@ -94,7 +94,7 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
|
||||
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
|
||||
blockposition1 = blockposition2;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index dc7bba566ec321f645848c734ab00a627e85bcb8..2cb1d795b11203c2f5cd85d7ff049faeac7ac71a 100644
|
||||
index a2612c026ae87995881cb339f4d3481a3274c509..23d31f27239d937ec38909e8faa3e9276c76ab37 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -72,6 +72,12 @@ public class PurpurWorldConfig {
|
||||
@@ -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 2cb1d795b11203c2f5cd85d7ff049faeac7ac71a..5dd75f2766558101726eac91a66b44fe424036ce 100644
|
||||
index 23d31f27239d937ec38909e8faa3e9276c76ab37..e372a4f1434f95be1f76f192c16f95403e3fbed2 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -300,6 +300,7 @@ public class PurpurWorldConfig {
|
||||
@@ -298,6 +298,7 @@ public class PurpurWorldConfig {
|
||||
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
||||
public double voidDamageHeight = -64.0D;
|
||||
public double voidDamageDealt = 4.0D;
|
||||
@@ -63,7 +63,7 @@ index 2cb1d795b11203c2f5cd85d7ff049faeac7ac71a..5dd75f2766558101726eac91a66b44fe
|
||||
private void miscGameplayMechanicsSettings() {
|
||||
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
|
||||
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
|
||||
@@ -309,6 +310,7 @@ public class PurpurWorldConfig {
|
||||
@@ -307,6 +308,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);
|
||||
@@ -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 5dd75f2766558101726eac91a66b44fe424036ce..9fc43202b0f06763f8dbe9a740abd53c8cb4ed6e 100644
|
||||
index e372a4f1434f95be1f76f192c16f95403e3fbed2..2ff62f1637a3157b8b088d2156e809ff835f52d3 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -267,6 +267,35 @@ public class PurpurWorldConfig {
|
||||
@@ -265,6 +265,35 @@ public class PurpurWorldConfig {
|
||||
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
|
||||
}
|
||||
|
||||
@@ -71,10 +71,10 @@ index f6e33ca1933792a3a417f54d20fea8dc4a41c1b5..7eed6c176345c766a99d4304d61d2835
|
||||
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 9fc43202b0f06763f8dbe9a740abd53c8cb4ed6e..ff4ed0c1bdf5fbf2c137f0d059b6f696ab32e780 100644
|
||||
index 2ff62f1637a3157b8b088d2156e809ff835f52d3..428efdab81fdc2e345b9d92e58c1cb7d0d9202c2 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1646,6 +1646,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1644,6 +1644,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieJockeyOnlyBaby = true;
|
||||
public double zombieJockeyChance = 0.05D;
|
||||
public boolean zombieJockeyTryExistingChickens = true;
|
||||
@@ -82,7 +82,7 @@ index 9fc43202b0f06763f8dbe9a740abd53c8cb4ed6e..ff4ed0c1bdf5fbf2c137f0d059b6f696
|
||||
private void zombieSettings() {
|
||||
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
|
||||
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
|
||||
@@ -1659,6 +1660,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1657,6 +1658,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);
|
||||
@@ -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 ff4ed0c1bdf5fbf2c137f0d059b6f696ab32e780..4339e247345cc6d007fcb1a84cdb65d7b5667f25 100644
|
||||
index 428efdab81fdc2e345b9d92e58c1cb7d0d9202c2..300741d57574757bf9fed8bee27cbb1bed63a652 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -326,6 +326,7 @@ public class PurpurWorldConfig {
|
||||
@@ -324,6 +324,7 @@ public class PurpurWorldConfig {
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
public boolean entitiesCanUsePortals = true;
|
||||
public boolean milkCuresBadOmen = true;
|
||||
@@ -200,7 +200,7 @@ index ff4ed0c1bdf5fbf2c137f0d059b6f696ab32e780..4339e247345cc6d007fcb1a84cdb65d7
|
||||
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
||||
public double voidDamageHeight = -64.0D;
|
||||
public double voidDamageDealt = 4.0D;
|
||||
@@ -336,6 +337,7 @@ public class PurpurWorldConfig {
|
||||
@@ -334,6 +335,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);
|
||||
@@ -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 4339e247345cc6d007fcb1a84cdb65d7b5667f25..ad05c691e51e30d44b5bb807228a470498a5a7bd 100644
|
||||
index 300741d57574757bf9fed8bee27cbb1bed63a652..cd0fce795cbd75acc8bbc8f5bd098286d281ac5d 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -813,9 +813,11 @@ public class PurpurWorldConfig {
|
||||
@@ -811,9 +811,11 @@ public class PurpurWorldConfig {
|
||||
|
||||
public boolean glowSquidRidable = false;
|
||||
public double glowSquidMaxHealth = 10.0D;
|
||||
@@ -73,7 +73,7 @@ index 4339e247345cc6d007fcb1a84cdb65d7b5667f25..ad05c691e51e30d44b5bb807228a4704
|
||||
}
|
||||
|
||||
public boolean goatRidable = false;
|
||||
@@ -1371,6 +1373,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1369,6 +1371,7 @@ public class PurpurWorldConfig {
|
||||
public double squidMaxHealth = 10.0D;
|
||||
public boolean squidImmuneToEAR = true;
|
||||
public double squidOffsetWaterCheck = 0.0D;
|
||||
@@ -81,7 +81,7 @@ index 4339e247345cc6d007fcb1a84cdb65d7b5667f25..ad05c691e51e30d44b5bb807228a4704
|
||||
private void squidSettings() {
|
||||
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -1381,6 +1384,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1379,6 +1382,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);
|
||||
@@ -27,7 +27,7 @@ index afe33f20578177cb517e1c116e6319481642e66c..fe4695adbb506733b4029ecfabcfda3d
|
||||
} else {
|
||||
user.startUsingItem(hand);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ad05c691e51e30d44b5bb807228a470498a5a7bd..54c5e96002a25f7f9d8c876c3d57aced6e5b2d25 100644
|
||||
index cd0fce795cbd75acc8bbc8f5bd098286d281ac5d..419ed2a7778699831fc43e53eb3940d735dce6f4 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -122,6 +122,17 @@ public class PurpurWorldConfig {
|
||||
@@ -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 54c5e96002a25f7f9d8c876c3d57aced6e5b2d25..0f6af8555c9acbe3eb3088859557adc6b9742c88 100644
|
||||
index 419ed2a7778699831fc43e53eb3940d735dce6f4..02716d2cdaccb386bb84329dce02a175b03fd656 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -449,6 +449,11 @@ public class PurpurWorldConfig {
|
||||
@@ -447,6 +447,11 @@ public class PurpurWorldConfig {
|
||||
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ index 7944a33cf36878c9e4853637bfb9cba22ba8bc4d..3bc63f24bf8c07b89562887bdc8cf756
|
||||
|
||||
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 0f6af8555c9acbe3eb3088859557adc6b9742c88..875f1265f36d2c7785d525ccd8ce3fca17922f9b 100644
|
||||
index 02716d2cdaccb386bb84329dce02a175b03fd656..5d29dfbeefb325117c68d5a9dd8b97939a28c726 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -104,6 +104,13 @@ public class PurpurWorldConfig {
|
||||
@@ -48,10 +48,10 @@ index 242d9b2ecb852d812d4887883cb2aabfd21e3715..2c64622577fdb6c2a5746471121403b6
|
||||
|
||||
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 875f1265f36d2c7785d525ccd8ce3fca17922f9b..b03f972040cf11a659560afa696a2f0498a6dd53 100644
|
||||
index 5d29dfbeefb325117c68d5a9dd8b97939a28c726..9ff0f451016a2753ac020ca2573ed6c4833790d3 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -417,6 +417,17 @@ public class PurpurWorldConfig {
|
||||
@@ -415,6 +415,17 @@ public class PurpurWorldConfig {
|
||||
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
|
||||
}
|
||||
|
||||
@@ -24,10 +24,10 @@ index ee5bc54e37e5ae120e846ddd2cae5ca39c293c98..f2ddc1c9c4fa029544866b779b4b0359
|
||||
return;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index b03f972040cf11a659560afa696a2f0498a6dd53..5d428641a91c73bccf65e5a8247a64bf958d7a9e 100644
|
||||
index 9ff0f451016a2753ac020ca2573ed6c4833790d3..18aa966b09283b9f6cfa5a1ed55c4be9c0adfc5a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -413,8 +413,10 @@ public class PurpurWorldConfig {
|
||||
@@ -411,8 +411,10 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
|
||||
public boolean farmlandGetsMoistFromBelow = false;
|
||||
@@ -95,10 +95,10 @@ index e52a708904d7c7d8d19e9def3bc915a9141c2bed..42c9952ee868fa54d9b6f2db8e08e3bc
|
||||
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 5d428641a91c73bccf65e5a8247a64bf958d7a9e..db5bbd12e6f9d2ab173b0d186f449a26c9562091 100644
|
||||
index 18aa966b09283b9f6cfa5a1ed55c4be9c0adfc5a..024dfc34ad2b059ae00c9c98b03ff6213cf99f2b 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -349,6 +349,7 @@ public class PurpurWorldConfig {
|
||||
@@ -347,6 +347,7 @@ public class PurpurWorldConfig {
|
||||
public double voidDamageHeight = -64.0D;
|
||||
public double voidDamageDealt = 4.0D;
|
||||
public int raidCooldownSeconds = 0;
|
||||
@@ -106,7 +106,7 @@ index 5d428641a91c73bccf65e5a8247a64bf958d7a9e..db5bbd12e6f9d2ab173b0d186f449a26
|
||||
private void miscGameplayMechanicsSettings() {
|
||||
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
|
||||
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
|
||||
@@ -360,6 +361,7 @@ public class PurpurWorldConfig {
|
||||
@@ -358,6 +359,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);
|
||||
@@ -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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee321063c07 100644
|
||||
index 024dfc34ad2b059ae00c9c98b03ff6213cf99f2b..e2fba907cad997006557c43e627df1a419c7ca75 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -487,9 +487,11 @@ public class PurpurWorldConfig {
|
||||
@@ -485,9 +485,11 @@ public class PurpurWorldConfig {
|
||||
|
||||
public boolean axolotlRidable = false;
|
||||
public double axolotlMaxHealth = 14.0D;
|
||||
@@ -489,7 +489,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean batRidable = false;
|
||||
@@ -519,6 +521,7 @@ public class PurpurWorldConfig {
|
||||
@@ -517,6 +519,7 @@ public class PurpurWorldConfig {
|
||||
public boolean beeRidableInWater = false;
|
||||
public double beeMaxY = 256D;
|
||||
public double beeMaxHealth = 10.0D;
|
||||
@@ -497,7 +497,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void beeSettings() {
|
||||
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
|
||||
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
|
||||
@@ -529,6 +532,7 @@ public class PurpurWorldConfig {
|
||||
@@ -527,6 +530,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.bee.attributes.max_health", oldValue);
|
||||
}
|
||||
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
|
||||
@@ -505,7 +505,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean blazeRidable = false;
|
||||
@@ -553,6 +557,7 @@ public class PurpurWorldConfig {
|
||||
@@ -551,6 +555,7 @@ public class PurpurWorldConfig {
|
||||
public int catSpawnDelay = 1200;
|
||||
public int catSpawnSwampHutScanRange = 16;
|
||||
public int catSpawnVillageScanRange = 48;
|
||||
@@ -513,7 +513,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void catSettings() {
|
||||
catRidable = getBoolean("mobs.cat.ridable", catRidable);
|
||||
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
|
||||
@@ -565,6 +570,7 @@ public class PurpurWorldConfig {
|
||||
@@ -563,6 +568,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean caveSpiderRidable = false;
|
||||
@@ -585,6 +591,7 @@ public class PurpurWorldConfig {
|
||||
@@ -583,6 +589,7 @@ public class PurpurWorldConfig {
|
||||
public boolean chickenRidableInWater = false;
|
||||
public double chickenMaxHealth = 4.0D;
|
||||
public boolean chickenRetaliate = false;
|
||||
@@ -529,7 +529,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void chickenSettings() {
|
||||
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
|
||||
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
|
||||
@@ -595,6 +602,7 @@ public class PurpurWorldConfig {
|
||||
@@ -593,6 +600,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
|
||||
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
|
||||
@@ -537,7 +537,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean codRidable = false;
|
||||
@@ -613,6 +621,7 @@ public class PurpurWorldConfig {
|
||||
@@ -611,6 +619,7 @@ public class PurpurWorldConfig {
|
||||
public boolean cowRidableInWater = false;
|
||||
public double cowMaxHealth = 10.0D;
|
||||
public int cowFeedMushrooms = 0;
|
||||
@@ -545,7 +545,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void cowSettings() {
|
||||
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
|
||||
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
|
||||
@@ -623,6 +632,7 @@ public class PurpurWorldConfig {
|
||||
@@ -621,6 +630,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean creeperRidable = false;
|
||||
@@ -670,6 +680,7 @@ public class PurpurWorldConfig {
|
||||
@@ -668,6 +678,7 @@ public class PurpurWorldConfig {
|
||||
public double donkeyJumpStrengthMax = 0.5D;
|
||||
public double donkeyMovementSpeedMin = 0.175D;
|
||||
public double donkeyMovementSpeedMax = 0.175D;
|
||||
@@ -561,7 +561,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void donkeySettings() {
|
||||
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -685,6 +696,7 @@ public class PurpurWorldConfig {
|
||||
@@ -683,6 +694,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean drownedRidable = false;
|
||||
@@ -791,6 +803,7 @@ public class PurpurWorldConfig {
|
||||
@@ -789,6 +801,7 @@ public class PurpurWorldConfig {
|
||||
public boolean foxRidableInWater = false;
|
||||
public double foxMaxHealth = 10.0D;
|
||||
public boolean foxTypeChangesWithTulips = false;
|
||||
@@ -577,7 +577,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void foxSettings() {
|
||||
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
|
||||
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
|
||||
@@ -801,6 +814,7 @@ public class PurpurWorldConfig {
|
||||
@@ -799,6 +812,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean ghastRidable = false;
|
||||
@@ -861,10 +875,12 @@ public class PurpurWorldConfig {
|
||||
@@ -859,10 +873,12 @@ public class PurpurWorldConfig {
|
||||
public boolean goatRidable = false;
|
||||
public boolean goatRidableInWater = false;
|
||||
public double goatMaxHealth = 10.0D;
|
||||
@@ -598,7 +598,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean guardianRidable = false;
|
||||
@@ -882,6 +898,7 @@ public class PurpurWorldConfig {
|
||||
@@ -880,6 +896,7 @@ public class PurpurWorldConfig {
|
||||
public boolean hoglinRidable = false;
|
||||
public boolean hoglinRidableInWater = false;
|
||||
public double hoglinMaxHealth = 40.0D;
|
||||
@@ -606,7 +606,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void hoglinSettings() {
|
||||
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
|
||||
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
|
||||
@@ -891,6 +908,7 @@ public class PurpurWorldConfig {
|
||||
@@ -889,6 +906,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.hoglin.attributes.max_health", oldValue);
|
||||
}
|
||||
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
|
||||
@@ -614,7 +614,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean horseRidableInWater = false;
|
||||
@@ -900,6 +918,7 @@ public class PurpurWorldConfig {
|
||||
@@ -898,6 +916,7 @@ public class PurpurWorldConfig {
|
||||
public double horseJumpStrengthMax = 1.0D;
|
||||
public double horseMovementSpeedMin = 0.1125D;
|
||||
public double horseMovementSpeedMax = 0.3375D;
|
||||
@@ -622,7 +622,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void horseSettings() {
|
||||
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -915,6 +934,7 @@ public class PurpurWorldConfig {
|
||||
@@ -913,6 +932,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean huskRidable = false;
|
||||
@@ -985,6 +1005,7 @@ public class PurpurWorldConfig {
|
||||
@@ -983,6 +1003,7 @@ public class PurpurWorldConfig {
|
||||
public double llamaJumpStrengthMax = 0.5D;
|
||||
public double llamaMovementSpeedMin = 0.175D;
|
||||
public double llamaMovementSpeedMax = 0.175D;
|
||||
@@ -638,7 +638,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void llamaSettings() {
|
||||
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
|
||||
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
|
||||
@@ -1001,6 +1022,7 @@ public class PurpurWorldConfig {
|
||||
@@ -999,6 +1020,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean magmaCubeRidable = false;
|
||||
@@ -1020,6 +1042,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1018,6 +1040,7 @@ public class PurpurWorldConfig {
|
||||
public boolean mooshroomRidable = false;
|
||||
public boolean mooshroomRidableInWater = false;
|
||||
public double mooshroomMaxHealth = 10.0D;
|
||||
@@ -654,7 +654,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void mooshroomSettings() {
|
||||
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
|
||||
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
|
||||
@@ -1029,6 +1052,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1027,6 +1050,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.mooshroom.attributes.max_health", oldValue);
|
||||
}
|
||||
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
|
||||
@@ -662,7 +662,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean muleRidableInWater = false;
|
||||
@@ -1038,6 +1062,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1036,6 +1060,7 @@ public class PurpurWorldConfig {
|
||||
public double muleJumpStrengthMax = 0.5D;
|
||||
public double muleMovementSpeedMin = 0.175D;
|
||||
public double muleMovementSpeedMax = 0.175D;
|
||||
@@ -670,7 +670,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void muleSettings() {
|
||||
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -1053,11 +1078,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1051,11 +1076,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void ocelotSettings() {
|
||||
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
|
||||
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
|
||||
@@ -1067,11 +1094,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1065,11 +1092,13 @@ public class PurpurWorldConfig {
|
||||
set("mobs.ocelot.attributes.max_health", oldValue);
|
||||
}
|
||||
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
|
||||
@@ -698,7 +698,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void pandaSettings() {
|
||||
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
|
||||
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
|
||||
@@ -1081,6 +1110,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1079,6 +1108,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.panda.attributes.max_health", oldValue);
|
||||
}
|
||||
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
|
||||
@@ -706,7 +706,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean parrotRidable = false;
|
||||
@@ -1161,6 +1191,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1159,6 +1189,7 @@ public class PurpurWorldConfig {
|
||||
public boolean pigRidableInWater = false;
|
||||
public double pigMaxHealth = 10.0D;
|
||||
public boolean pigGiveSaddleBack = false;
|
||||
@@ -714,7 +714,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void pigSettings() {
|
||||
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
|
||||
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
|
||||
@@ -1171,6 +1202,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1169,6 +1200,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean piglinRidable = false;
|
||||
@@ -1220,6 +1252,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1218,6 +1250,7 @@ public class PurpurWorldConfig {
|
||||
public double polarBearMaxHealth = 30.0D;
|
||||
public String polarBearBreedableItemString = "";
|
||||
public Item polarBearBreedableItem = null;
|
||||
@@ -730,7 +730,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void polarBearSettings() {
|
||||
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
|
||||
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
|
||||
@@ -1232,6 +1265,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1230,6 +1263,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean pufferfishRidable = false;
|
||||
@@ -1251,6 +1285,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1249,6 +1283,7 @@ public class PurpurWorldConfig {
|
||||
public double rabbitMaxHealth = 3.0D;
|
||||
public double rabbitNaturalToast = 0.0D;
|
||||
public double rabbitNaturalKiller = 0.0D;
|
||||
@@ -746,7 +746,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void rabbitSettings() {
|
||||
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
|
||||
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
|
||||
@@ -1262,6 +1297,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1260,6 +1295,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean ravagerRidable = false;
|
||||
@@ -1293,6 +1329,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1291,6 +1327,7 @@ public class PurpurWorldConfig {
|
||||
public boolean sheepRidable = false;
|
||||
public boolean sheepRidableInWater = false;
|
||||
public double sheepMaxHealth = 8.0D;
|
||||
@@ -762,7 +762,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void sheepSettings() {
|
||||
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
|
||||
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
|
||||
@@ -1302,6 +1339,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1300,6 +1337,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.sheep.attributes.max_health", oldValue);
|
||||
}
|
||||
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
|
||||
@@ -770,7 +770,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean shulkerRidable = false;
|
||||
@@ -1456,6 +1494,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1454,6 +1492,7 @@ public class PurpurWorldConfig {
|
||||
public boolean striderRidable = false;
|
||||
public boolean striderRidableInWater = false;
|
||||
public double striderMaxHealth = 20.0D;
|
||||
@@ -778,7 +778,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void striderSettings() {
|
||||
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
|
||||
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
|
||||
@@ -1465,6 +1504,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1463,6 +1502,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.strider.attributes.max_health", oldValue);
|
||||
}
|
||||
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
|
||||
@@ -786,7 +786,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean traderLlamaRidable = false;
|
||||
@@ -1475,6 +1515,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1473,6 +1513,7 @@ public class PurpurWorldConfig {
|
||||
public double traderLlamaJumpStrengthMax = 0.5D;
|
||||
public double traderLlamaMovementSpeedMin = 0.175D;
|
||||
public double traderLlamaMovementSpeedMax = 0.175D;
|
||||
@@ -794,7 +794,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void traderLlamaSettings() {
|
||||
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
|
||||
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
|
||||
@@ -1491,6 +1532,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1489,6 +1530,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean tropicalFishRidable = false;
|
||||
@@ -1511,6 +1553,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1509,6 +1551,7 @@ public class PurpurWorldConfig {
|
||||
public boolean turtleEggsBreakFromExpOrbs = true;
|
||||
public boolean turtleEggsBreakFromItems = true;
|
||||
public boolean turtleEggsBreakFromMinecarts = true;
|
||||
@@ -810,7 +810,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void turtleEggSettings() {
|
||||
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
|
||||
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
|
||||
@@ -1523,6 +1566,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1521,6 +1564,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean vexRidable = false;
|
||||
@@ -1551,6 +1595,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1549,6 +1593,7 @@ public class PurpurWorldConfig {
|
||||
public int villagerSpawnIronGolemRadius = 0;
|
||||
public int villagerSpawnIronGolemLimit = 0;
|
||||
public boolean villagerCanBreed = true;
|
||||
@@ -826,7 +826,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1567,6 +1612,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1565,6 +1610,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 db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
}
|
||||
|
||||
public boolean vindicatorRidable = false;
|
||||
@@ -1658,6 +1704,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1656,6 +1702,7 @@ public class PurpurWorldConfig {
|
||||
public boolean wolfRidable = false;
|
||||
public boolean wolfRidableInWater = false;
|
||||
public double wolfMaxHealth = 8.0D;
|
||||
@@ -842,7 +842,7 @@ index db5bbd12e6f9d2ab173b0d186f449a26c9562091..ce8d9aceaf367198f2dc81c9b675cee3
|
||||
private void wolfSettings() {
|
||||
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
|
||||
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
|
||||
@@ -1667,6 +1714,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1665,6 +1712,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wolf.attributes.max_health", oldValue);
|
||||
}
|
||||
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
|
||||
@@ -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 ce8d9aceaf367198f2dc81c9b675cee321063c07..ef724d7ad3598786e885d472bbb9bf009d50296d 100644
|
||||
index e2fba907cad997006557c43e627df1a419c7ca75..ccb2c68b8c0a62ea20f8585bfcd750c7a4a23982 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -100,8 +100,10 @@ public class PurpurWorldConfig {
|
||||
@@ -156,7 +156,7 @@ index ce8d9aceaf367198f2dc81c9b675cee321063c07..ef724d7ad3598786e885d472bbb9bf00
|
||||
}
|
||||
|
||||
public int daytimeTicks = 12000;
|
||||
@@ -345,6 +347,7 @@ public class PurpurWorldConfig {
|
||||
@@ -343,6 +345,7 @@ public class PurpurWorldConfig {
|
||||
public boolean entitiesCanUsePortals = true;
|
||||
public boolean milkCuresBadOmen = true;
|
||||
public boolean persistentTileEntityDisplayNames = false;
|
||||
@@ -164,7 +164,7 @@ index ce8d9aceaf367198f2dc81c9b675cee321063c07..ef724d7ad3598786e885d472bbb9bf00
|
||||
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
||||
public double voidDamageHeight = -64.0D;
|
||||
public double voidDamageDealt = 4.0D;
|
||||
@@ -357,6 +360,7 @@ public class PurpurWorldConfig {
|
||||
@@ -355,6 +358,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);
|
||||
@@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
|
||||
((Mob) newEntityLiving).setPersistenceRequired();
|
||||
// Paper end
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ef724d7ad3598786e885d472bbb9bf009d50296d..18fcd53c428bfb2eae159ce0bc0fc2d8c4d83f45 100644
|
||||
index ccb2c68b8c0a62ea20f8585bfcd750c7a4a23982..9940426744c681ec20c10cb3008170b25d6125d5 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -101,9 +101,11 @@ public class PurpurWorldConfig {
|
||||
@@ -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 18fcd53c428bfb2eae159ce0bc0fc2d8c4d83f45..1b6684f9069180b99ea5f404ec6520741b62b805 100644
|
||||
index 9940426744c681ec20c10cb3008170b25d6125d5..49addc31c041203942036fd23d519f22f5477a1a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -413,6 +413,11 @@ public class PurpurWorldConfig {
|
||||
@@ -411,6 +411,11 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ index 18fcd53c428bfb2eae159ce0bc0fc2d8c4d83f45..1b6684f9069180b99ea5f404ec652074
|
||||
public boolean dispenserApplyCursedArmor = true;
|
||||
public boolean dispenserPlaceAnvils = false;
|
||||
private void dispenserSettings() {
|
||||
@@ -482,6 +487,16 @@ public class PurpurWorldConfig {
|
||||
@@ -480,6 +485,16 @@ public class PurpurWorldConfig {
|
||||
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
|
||||
}
|
||||
|
||||
@@ -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 1b6684f9069180b99ea5f404ec6520741b62b805..b95ad55bb37bed8acae07e7e6483950d694ed99a 100644
|
||||
index 49addc31c041203942036fd23d519f22f5477a1a..d615859fc8563dff3fdb9d9b12a08a5486692515 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -414,8 +414,10 @@ public class PurpurWorldConfig {
|
||||
@@ -412,8 +412,10 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
|
||||
public double caveVinesGrowthModifier = 0.10D;
|
||||
@@ -117,7 +117,7 @@ index 1b6684f9069180b99ea5f404ec6520741b62b805..b95ad55bb37bed8acae07e7e6483950d
|
||||
}
|
||||
|
||||
public boolean dispenserApplyCursedArmor = true;
|
||||
@@ -454,6 +456,11 @@ public class PurpurWorldConfig {
|
||||
@@ -452,6 +454,11 @@ public class PurpurWorldConfig {
|
||||
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ index 1b6684f9069180b99ea5f404ec6520741b62b805..b95ad55bb37bed8acae07e7e6483950d
|
||||
public boolean respawnAnchorExplode = true;
|
||||
public double respawnAnchorExplosionPower = 5.0D;
|
||||
public boolean respawnAnchorExplosionFire = true;
|
||||
@@ -488,13 +495,17 @@ public class PurpurWorldConfig {
|
||||
@@ -486,13 +493,17 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
|
||||
public double twistingVinesGrowthModifier = 0.10D;
|
||||
@@ -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 b95ad55bb37bed8acae07e7e6483950d694ed99a..6664c12ebd83b22fd70c2050c1270c68504ad82e 100644
|
||||
index d615859fc8563dff3fdb9d9b12a08a5486692515..eaf382e412dbf42075fb9ee45c35bb972b5f40da 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -791,6 +791,7 @@ public class PurpurWorldConfig {
|
||||
@@ -789,6 +789,7 @@ public class PurpurWorldConfig {
|
||||
public boolean endermanRidableInWater = false;
|
||||
public double endermanMaxHealth = 40.0D;
|
||||
public boolean endermanAllowGriefing = true;
|
||||
@@ -32,7 +32,7 @@ index b95ad55bb37bed8acae07e7e6483950d694ed99a..6664c12ebd83b22fd70c2050c1270c68
|
||||
private void endermanSettings() {
|
||||
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
|
||||
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
|
||||
@@ -801,6 +802,7 @@ public class PurpurWorldConfig {
|
||||
@@ -799,6 +800,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
|
||||
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
|
||||
@@ -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 6664c12ebd83b22fd70c2050c1270c68504ad82e..c9f7fb60d02087d291c73f2a761efac4981f72ba 100644
|
||||
index eaf382e412dbf42075fb9ee45c35bb972b5f40da..5b05056720f32196de4ff30ffa1288812e30ea81 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -289,6 +289,11 @@ public class PurpurWorldConfig {
|
||||
@@ -287,6 +287,11 @@ public class PurpurWorldConfig {
|
||||
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
|
||||
}
|
||||
|
||||
@@ -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 c9f7fb60d02087d291c73f2a761efac4981f72ba..f4abf71d8c0bf03fa7c413e62b1ea356a3c51a5c 100644
|
||||
index 5b05056720f32196de4ff30ffa1288812e30ea81..c99f97d68752d89037a017761abdc3bef2ef3785 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1778,6 +1778,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1776,6 +1776,7 @@ public class PurpurWorldConfig {
|
||||
public double zombieJockeyChance = 0.05D;
|
||||
public boolean zombieJockeyTryExistingChickens = true;
|
||||
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
|
||||
@@ -55,7 +55,7 @@ index c9f7fb60d02087d291c73f2a761efac4981f72ba..f4abf71d8c0bf03fa7c413e62b1ea356
|
||||
private void zombieSettings() {
|
||||
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
|
||||
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
|
||||
@@ -1792,6 +1793,11 @@ public class PurpurWorldConfig {
|
||||
@@ -1790,6 +1791,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);
|
||||
@@ -18,7 +18,7 @@ index ea53ece9afe9e35323a88647901a83a4bf4225b8..11042a7b13e5029162ad977b5835c82a
|
||||
} else {
|
||||
this.setLeftHanded(false);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index f4abf71d8c0bf03fa7c413e62b1ea356a3c51a5c..aa1fafb4f10405bd78e353476f10dfe78be7445c 100644
|
||||
index c99f97d68752d89037a017761abdc3bef2ef3785..b97175d637c679dcb29b2781f8e8f7d020738527 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -129,8 +129,10 @@ public class PurpurWorldConfig {
|
||||
@@ -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 e57e8e7553d41af9686283b74cc01791a76c5b0e..c04d22495f38a41aa9ca2477edd7a24df09639e8 100644
|
||||
index 074abae3d83c3f170b1d4e5134a204c7acdc49bc..b520d4980180462628ede1383ee1826bbd6a6ad2 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -988,7 +988,16 @@ public class ServerPlayer extends Player {
|
||||
@@ -27,10 +27,10 @@ index e57e8e7553d41af9686283b74cc01791a76c5b0e..c04d22495f38a41aa9ca2477edd7a24d
|
||||
|
||||
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 aa1fafb4f10405bd78e353476f10dfe78be7445c..986295105cc4ee8a49260840f265bbf0d6cc5654 100644
|
||||
index b97175d637c679dcb29b2781f8e8f7d020738527..d2597cd2f6c195003a52b5e8e0d48e43bccd9c82 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -352,6 +352,7 @@ public class PurpurWorldConfig {
|
||||
@@ -350,6 +350,7 @@ public class PurpurWorldConfig {
|
||||
|
||||
public boolean useBetterMending = false;
|
||||
public boolean boatEjectPlayersOnLand = false;
|
||||
@@ -38,7 +38,7 @@ index aa1fafb4f10405bd78e353476f10dfe78be7445c..986295105cc4ee8a49260840f265bbf0
|
||||
public boolean disableDropsOnCrammingDeath = false;
|
||||
public boolean entitiesCanUsePortals = true;
|
||||
public boolean milkCuresBadOmen = true;
|
||||
@@ -365,6 +366,7 @@ public class PurpurWorldConfig {
|
||||
@@ -363,6 +364,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);
|
||||
@@ -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 986295105cc4ee8a49260840f265bbf0d6cc5654..4b7dfa4149df5ddc3b5d868e471da613e8eb7c71 100644
|
||||
index d2597cd2f6c195003a52b5e8e0d48e43bccd9c82..f2f4e27bb87789d1d91fa433f356ff628989de01 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1474,6 +1474,10 @@ public class PurpurWorldConfig {
|
||||
@@ -1472,6 +1472,10 @@ public class PurpurWorldConfig {
|
||||
public double snowGolemMaxHealth = 4.0D;
|
||||
public boolean snowGolemDropsPumpkin = true;
|
||||
public boolean snowGolemPutPumpkinBack = false;
|
||||
@@ -37,7 +37,7 @@ index 986295105cc4ee8a49260840f265bbf0d6cc5654..4b7dfa4149df5ddc3b5d868e471da613
|
||||
private void snowGolemSettings() {
|
||||
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
|
||||
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
|
||||
@@ -1486,6 +1490,10 @@ public class PurpurWorldConfig {
|
||||
@@ -1484,6 +1488,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);
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index b07368ed5b8fcacd617988d09d5d27904315cf27..11576c89a4d7a6a29b1d17a6126fcba8154a6a4b 100644
|
||||
index f65e3b51e876f7a3d30710eed56fdca4daa620c9..7a3b994ab30597d46753ebe2b78e07a3e9bfb47f 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -49,6 +49,11 @@ public class PaperWorldConfig {
|
||||
@@ -54,6 +54,11 @@ public class PaperWorldConfig {
|
||||
zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
|
||||
}
|
||||
|
||||
@@ -53,10 +53,10 @@ index 4752205ab570ab8f6ae7f0a15ae610b603ade2ea..ddfb060e229df3a11cef4e0cb08f0cd2
|
||||
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 4b7dfa4149df5ddc3b5d868e471da613e8eb7c71..a854ec0ea0bd0709087a1bf340a7c1706d8007d5 100644
|
||||
index f2f4e27bb87789d1d91fa433f356ff628989de01..f2b875eb5c1f844f47e913e00a14d9e4028ab3e2 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1647,6 +1647,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1645,6 +1645,8 @@ public class PurpurWorldConfig {
|
||||
public int villagerSpawnIronGolemLimit = 0;
|
||||
public boolean villagerCanBreed = true;
|
||||
public int villagerBreedingTicks = 6000;
|
||||
@@ -65,7 +65,7 @@ index 4b7dfa4149df5ddc3b5d868e471da613e8eb7c71..a854ec0ea0bd0709087a1bf340a7c170
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1664,6 +1666,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1662,6 +1664,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);
|
||||
@@ -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 a854ec0ea0bd0709087a1bf340a7c1706d8007d5..279c9ecce2c16018a03d03954832db1d67a5bff9 100644
|
||||
index f2b875eb5c1f844f47e913e00a14d9e4028ab3e2..9a568a2dc8ceead516a1bd00149a8bd3fad75da5 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1649,6 +1649,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1647,6 +1647,8 @@ public class PurpurWorldConfig {
|
||||
public int villagerBreedingTicks = 6000;
|
||||
public boolean villagerLobotomizeEnabled = false;
|
||||
public int villagerLobotomizeCheck = 60;
|
||||
@@ -197,7 +197,7 @@ index a854ec0ea0bd0709087a1bf340a7c1706d8007d5..279c9ecce2c16018a03d03954832db1d
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1673,6 +1675,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1671,6 +1673,8 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
|
||||
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
|
||||
@@ -35,10 +35,10 @@ index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 279c9ecce2c16018a03d03954832db1d67a5bff9..85812544e5b56f979298cfc270370965dee1a684 100644
|
||||
index 9a568a2dc8ceead516a1bd00149a8bd3fad75da5..4cfc906506de7f2fa8ab8fec59b1b05ad88735cf 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1881,6 +1881,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1879,6 +1879,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombifiedPiglinJockeyOnlyBaby = true;
|
||||
public double zombifiedPiglinJockeyChance = 0.05D;
|
||||
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
|
||||
@@ -46,7 +46,7 @@ index 279c9ecce2c16018a03d03954832db1d67a5bff9..85812544e5b56f979298cfc270370965
|
||||
private void zombifiedPiglinSettings() {
|
||||
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
|
||||
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
|
||||
@@ -1894,5 +1895,6 @@ public class PurpurWorldConfig {
|
||||
@@ -1892,5 +1893,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);
|
||||
@@ -46,7 +46,7 @@ index 1d89441b6d650691aef4bbbb714cee1f3d73774a..29043f9354b29f7766f1d6d8e793e2ea
|
||||
|
||||
public void broadcastAll(Packet<?> packet) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 7bfcab5c4d27a95658441e77308ac5710136f5eb..b49d5e4edfea04cd916ffa23ea18aaf246898c2a 100644
|
||||
index 1d074ecc76eaf1ae10a6bd35b2f2a54f6654260e..d38d724cd024bec0554b078b0c7fd479a51dd736 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1564,7 +1564,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -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 85812544e5b56f979298cfc270370965dee1a684..393b5065afdc914cea56db7cb7f84e851f813e01 100644
|
||||
index 4cfc906506de7f2fa8ab8fec59b1b05ad88735cf..3cdd0cb69b1299c0a94ee7117c5bf182cf717251 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1768,6 +1768,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1766,6 +1766,8 @@ public class PurpurWorldConfig {
|
||||
public boolean wolfRidable = false;
|
||||
public boolean wolfRidableInWater = false;
|
||||
public double wolfMaxHealth = 8.0D;
|
||||
@@ -213,7 +213,7 @@ index 85812544e5b56f979298cfc270370965dee1a684..393b5065afdc914cea56db7cb7f84e85
|
||||
public int wolfBreedingTicks = 6000;
|
||||
private void wolfSettings() {
|
||||
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
|
||||
@@ -1778,6 +1780,8 @@ public class PurpurWorldConfig {
|
||||
@@ -1776,6 +1778,8 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wolf.attributes.max_health", oldValue);
|
||||
}
|
||||
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
|
||||
@@ -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 393b5065afdc914cea56db7cb7f84e851f813e01..90ec6012066305a92b18cd37328afa664699998e 100644
|
||||
index 3cdd0cb69b1299c0a94ee7117c5bf182cf717251..53b851ed720637b2556ff9de3131a38b21b9c21a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1768,6 +1768,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1766,6 +1766,7 @@ public class PurpurWorldConfig {
|
||||
public boolean wolfRidable = false;
|
||||
public boolean wolfRidableInWater = false;
|
||||
public double wolfMaxHealth = 8.0D;
|
||||
@@ -35,7 +35,7 @@ index 393b5065afdc914cea56db7cb7f84e851f813e01..90ec6012066305a92b18cd37328afa66
|
||||
public boolean wolfMilkCuresRabies = true;
|
||||
public double wolfNaturalRabid = 0.0D;
|
||||
public int wolfBreedingTicks = 6000;
|
||||
@@ -1780,6 +1781,11 @@ public class PurpurWorldConfig {
|
||||
@@ -1778,6 +1779,11 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wolf.attributes.max_health", oldValue);
|
||||
}
|
||||
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
|
||||
@@ -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 90ec6012066305a92b18cd37328afa664699998e..78d2eed6542e6fff46fdd802ea52ebf68cd6129d 100644
|
||||
index 53b851ed720637b2556ff9de3131a38b21b9c21a..2b34ae945d8da4d1d912b7556dd768c66dca121c 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1178,6 +1178,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1176,6 +1176,7 @@ public class PurpurWorldConfig {
|
||||
public float phantomFlameDamage = 1.0F;
|
||||
public int phantomFlameFireTime = 8;
|
||||
public boolean phantomAllowGriefing = false;
|
||||
@@ -28,7 +28,7 @@ index 90ec6012066305a92b18cd37328afa664699998e..78d2eed6542e6fff46fdd802ea52ebf6
|
||||
public double phantomMaxHealth = 20.0D;
|
||||
public double phantomAttackedByCrystalRadius = 0.0D;
|
||||
public float phantomAttackedByCrystalDamage = 1.0F;
|
||||
@@ -1204,6 +1205,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1202,6 +1203,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);
|
||||
@@ -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 78d2eed6542e6fff46fdd802ea52ebf68cd6129d..08c4d8b90e36195bdc15c9264d8064209cb72cf0 100644
|
||||
index 2b34ae945d8da4d1d912b7556dd768c66dca121c..00ff386aa01b998f281adad7d3f4e3bd67c26fe8 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -429,6 +429,11 @@ public class PurpurWorldConfig {
|
||||
@@ -427,6 +427,11 @@ public class PurpurWorldConfig {
|
||||
caveVinesMaxGrowthAge = getInt("blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge);
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ index 214b25f57f15e2127b92ec88117c36d4b2096477..652e596c37bf8d865c954b31ad7d2562
|
||||
this.hasLoggedStop = true; // Paper
|
||||
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
|
||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
index 1b8d836607d52c3bc67ad5f2accbc94663637d49..606d5577f121b0103e272bbe4ffa4b582c76469c 100644
|
||||
index fc6a6e88486c5c2dca1b10bfeae24124690d7b8d..4a3226b58ee3c11830dabba988b0665dc069559a 100644
|
||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
@@ -349,6 +349,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
@@ -42,7 +42,7 @@ index 1b8d836607d52c3bc67ad5f2accbc94663637d49..606d5577f121b0103e272bbe4ffa4b58
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index c04d22495f38a41aa9ca2477edd7a24df09639e8..a9f5e97f210d64949fcf3c058e132559009a268f 100644
|
||||
index b520d4980180462628ede1383ee1826bbd6a6ad2..21696b7a35cabca1c470304573c01557e21b7262 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -28,10 +28,10 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 08c4d8b90e36195bdc15c9264d8064209cb72cf0..dfcda4459ae7571c83ea962259171d70ce92094d 100644
|
||||
index 00ff386aa01b998f281adad7d3f4e3bd67c26fe8..c950dfc7087d9d66a45724926d21f9bb3a0ee30f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1553,6 +1553,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1551,6 +1551,7 @@ public class PurpurWorldConfig {
|
||||
public boolean striderRidableInWater = false;
|
||||
public double striderMaxHealth = 20.0D;
|
||||
public int striderBreedingTicks = 6000;
|
||||
@@ -39,7 +39,7 @@ index 08c4d8b90e36195bdc15c9264d8064209cb72cf0..dfcda4459ae7571c83ea962259171d70
|
||||
private void striderSettings() {
|
||||
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
|
||||
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
|
||||
@@ -1563,6 +1564,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1561,6 +1562,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
|
||||
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user