mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
4240de4a38
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e552beb Fix inventory desync (#9640) PaperMC/Paper@6f30f08 Readd old BlockDamageEvent constructor PaperMC/Paper@6813244 Fix/improve destroy speed API (#9645) PaperMC/Paper@7d13b70 Add titleOverride to InventoryOpenEvent (#7540) PaperMC/Paper@0e622c7 Add sniffer egg api (#9288) PaperMC/Paper@0c0a480 Do crystal-portal proximity check before entity lookup (#9611) Pufferfish Changes: pufferfish-gg/Pufferfish@30537a0 Updated Upstream (Paper) pufferfish-gg/Pufferfish@af1f56c Updated Upstream (Paper) pufferfish-gg/Pufferfish@f6a081a Updated Upstream (Paper) pufferfish-gg/Pufferfish@e148cd6 Updated Upstream (Paper) pufferfish-gg/Pufferfish@2611af8 Updated Upstream (Paper) pufferfish-gg/Pufferfish@68f7501 Updated Upstream (Paper) pufferfish-gg/Pufferfish@38b9f2e Updated Upstream (Paper) pufferfish-gg/Pufferfish@2bc9d45 Updated Upstream (Paper) pufferfish-gg/Pufferfish@a3c0a4d Updated Upstream (Paper)
40 lines
2.4 KiB
Diff
40 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Encode42 <me@encode42.dev>
|
|
Date: Mon, 8 Mar 2021 16:46:54 -0500
|
|
Subject: [PATCH] Config to ignore nearby mobs when sleeping
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
index 08532053face8fcba4a808830d618d2e5f0da8ee..fe1591b8ae12eaffdd44b23c4c55f580512f293e 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -1430,7 +1430,7 @@ public class ServerPlayer extends Player {
|
|
return entitymonster.isPreventingPlayerRest(this);
|
|
});
|
|
|
|
- if (!list.isEmpty()) {
|
|
+ if (!this.level().purpurConfig.playerSleepNearMonsters && !list.isEmpty()) { // Purpur
|
|
return Either.left(Player.BedSleepingProblem.NOT_SAFE);
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
index 02f332f2d1497668fbdf2e430d757f8699dc3a9a..7db005d02e762163c403a8358281afc2fa4f2df1 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -355,6 +355,7 @@ public class PurpurWorldConfig {
|
|
public boolean totemOfUndyingWorksInInventory = false;
|
|
public boolean playerFixStuckPortal = false;
|
|
public boolean creativeOnePunch = false;
|
|
+ public boolean playerSleepNearMonsters = false;
|
|
private void playerSettings() {
|
|
if (PurpurConfig.version < 19) {
|
|
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
|
|
@@ -374,6 +375,7 @@ public class PurpurWorldConfig {
|
|
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
|
|
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
|
|
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
|
|
+ playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
|
|
}
|
|
|
|
private static boolean projectileDespawnRateSettingsMigrated = false;
|