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

Updated Upstream (Paper & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b470400d5c Add methods to find targets for lightning strikes (#6712)
381a1462b3 Fix unplaced block states after new chunk gen API (#6747)
523a55c609 Fix loading cmds in datapacks (#6641)
a61827df91 VanillaCommandWrapper didnt account for entity senders (#6586)
cd610df101 Re-readd root/admin user detection (#6703)
4a0d935cd0 Always allow item changing in EntityFireball (#5493)
54813dbb21 [ci skip] Misc gradle updates (#6763)
56e65fd3a7 Null check isApplicable for CraftBlockEntityState#update
8575248648 Use ChatRenderer.defaultRenderer() when legacy events have not modified the format (#6104)

Airplane Changes:
f96ca1ce5d Upstream
89cdb2c72a Update Paperweight deps
317e61bb48 We love CI testing
This commit is contained in:
William Blake Galbreath
2021-10-13 07:51:34 -05:00
parent 91d3e65a73
commit 32fc651f97
9 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0227-Customizable-sleeping-actionbar-messages.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Customizable sleeping actionbar messages
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 30322750466f266eba295d39de30461c02423df9..369ad2615a7f8ee35de91451a4b9fa01031d0dc1 100644
index 984dd58c368595157e51c4c843512803bc8dfd02..74a748f988b08139edc67dcac43686680ebd97aa 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1055,11 +1055,29 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1061,11 +1061,29 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (this.canSleepThroughNights()) {
if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
@@ -40,7 +40,7 @@ index 30322750466f266eba295d39de30461c02423df9..369ad2615a7f8ee35de91451a4b9fa01
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 220af6285721db4090dbed3258db73e3c44e5e21..430a2a47cdb9ead034dfb2bfdfcae653a7bb03ac 100644
index 90599b9022fc1a1e79652f948cdf8ad3a32a2588..1c27d959bb4caeb6af331f4e240d9ef10454b475 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -168,6 +168,8 @@ public class PurpurConfig {