mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
7ed65d47b4
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c613877 Fix incorrect crafting result amount for fireworks (#9322) PaperMC/Paper@b169678 ratelimited packet is logged to console on kick (#9292) PaperMC/Paper@206dd3a Fix incorrect phantom spawning entity (#9385) PaperMC/Paper@aea9cdd Fix interact event call override (#9387) PaperMC/Paper@b34d4ec Fix cycle on paper plugin toString (#9392) PaperMC/Paper@e8bec64 Fix ugly java logger format for paper plugin dependency loader (#9395) Pufferfish Changes: pufferfish-gg/Pufferfish@21ed3a2 Updated Upstream (Paper) pufferfish-gg/Pufferfish@f28130c Updated Upstream (Paper) pufferfish-gg/Pufferfish@25f942d Fix entity ttl patch bug causing some entities to not be removed pufferfish-gg/Pufferfish@13dd49d Updated Upstream (Paper) pufferfish-gg/Pufferfish@2a6b66a Fix 'Already Retired' bug pufferfish-gg/Pufferfish@a1ed6f7 Attempt fixing PaperMC/Paper#9372 pufferfish-gg/Pufferfish@5587825 Holy whitespace pufferfish-gg/Pufferfish@ad7419e Pull PaperMC/Paper#9377 downstream
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 7c1b92611f175156116554b5d33636ecc888701d..14835575d7c8d8cd66ed072feec3c27fb1183de4 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 6a3343d5592b6bfabcff07de8f39f03a6ee3c651..18ded931a18138ae8429adc81d897dc01b4c20a5 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -356,6 +356,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);
|
|
@@ -375,6 +376,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;
|