mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-06-21 17:57:50 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6fe7eb5a Load World Key when its instance is created (#13818) PaperMC/Paper@944ce44a Fix CraftWorld identifier passing PaperMC/Paper@aa6f09b0 Prevent Happy Ghast from playing mount/dismount noises when silenced (#13807) PaperMC/Paper@7b31cc2b Make leaveMessage in PlayerKickEvent nullable (#13804) PaperMC/Paper@65461225 Update health after setPlayerProfile() (#13717) PaperMC/Paper@1a8417b1 [ci/skip] Add Javadocs for PotionEffect withX methods (#13723) PaperMC/Paper@4af86ff3 Handle null ServerLevel in fromGlobalPos (#13703) PaperMC/Paper@c39822ae reset pending keepalive state on listener handoff during reconfiguration (#13712) PaperMC/Paper@dcf5577a Fix PlayerProfile applySkinToPlayerHeadContents (#13692) PaperMC/Paper@dd203a27 chore: Don't log errors for accepting the EULA via the system property (#13681) PaperMC/Paper@d74f6bc7 Support for Kill damageable entities (#13667) PaperMC/Paper@90aee8e0 Update world methods to take in account environment attributes (#13543) PaperMC/Paper@b2b1e177 Improvement to Vehicle damage events (#13572) PaperMC/Paper@49daadd2 Fix insomniaStartTicks option being ignored for phantom spawning (#13609) PaperMC/Paper@57d84f68 Prevent NPE on ThrownPotion#splash (#13683) PaperMC/Paper@4f184db3 Fix memory leak on constantly damage (#13455) PaperMC/Paper@60073714 Update MOJIRA reference in DeOp command response for multiple targets [ci/skip] (#13812) PaperMC/Paper@4aef3f0a Remove already fixed vanilla bug MC-244739 (#13787) PaperMC/Paper@945aea99 Fix Damager for HangingBreakByEntityEvent and minor improvements (#12615) PaperMC/Paper@a8c05a35 Add an option to WorldCreator to avoid spawn location computation on world creation (#13407) PaperMC/Paper@182b2f8a Add Point Of Interest API (#12117) PaperMC/Paper@8021488e Disconnect State Fixes (#13616) PaperMC/Paper@1f819732 Allow ServerboundChangeGameModePacket if player has /gamemode permissions (#13507) PaperMC/Paper@a64ea13e Re-implement per-world and per-player time (#13814) PaperMC/Paper@acfe105b Add options to disable chunk and block entity ticking (#13821) PaperMC/Paper@651d8481 Finish world key initial migration (#13824) PaperMC/Paper@f4e769a7 Improvements checks for arguments numbers (#13290) PaperMC/Paper@5dc4afc1 Promote build channel to BETA PaperMC/Paper@55be6c0e Fix boat and minecart inventories on region switch [ci/skip] (#13826) PaperMC/Paper@7799bf28 Update Paperclip to v3.0.4
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
getTPS(this.tickTimes1m, interval),
|
||||
getTPS(this.tickTimes5m, interval),
|
||||
getTPS(this.tickTimes15m, interval)
|
||||
@@ -1047,6 +_,15 @@
|
||||
@@ -1057,6 +_,15 @@
|
||||
|
||||
LOGGER.info("Stopping server");
|
||||
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
|
||||
@@ -41,7 +41,7 @@
|
||||
// CraftBukkit start
|
||||
if (this.server != null) {
|
||||
this.server.spark.disable(); // Paper - spark
|
||||
@@ -1141,6 +_,8 @@
|
||||
@@ -1151,6 +_,8 @@
|
||||
this.safeShutdown(wait, false);
|
||||
}
|
||||
public void safeShutdown(final boolean wait, final boolean isRestarting) {
|
||||
@@ -50,7 +50,7 @@
|
||||
this.isRestarting = isRestarting;
|
||||
this.hasLoggedStop = true; // Paper - Debugging
|
||||
if (this.isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
|
||||
@@ -1322,11 +_,21 @@
|
||||
@@ -1332,11 +_,21 @@
|
||||
}
|
||||
// Paper end - Add onboarding message for initial server start
|
||||
// Paper start - Improve outdated version checking
|
||||
@@ -73,7 +73,7 @@
|
||||
while (this.running) {
|
||||
final long tickStart = System.nanoTime(); // Paper - improve tick loop
|
||||
long thisTickNanos; // Paper - improve tick loop - diff on change, expect this to be tick interval
|
||||
@@ -1340,9 +_,11 @@
|
||||
@@ -1350,9 +_,11 @@
|
||||
final long ticksBehind = Math.max(1L, this.tickSchedule.getPeriodsAhead(thisTickNanos, tickStart));
|
||||
final long catchup = (long)Math.max(
|
||||
1,
|
||||
@@ -86,7 +86,7 @@
|
||||
// adjust ticksBehind so that it is not greater-than catchup
|
||||
if (ticksBehind - catchup > 0L) {
|
||||
final long difference = ticksBehind - catchup;
|
||||
@@ -1965,7 +_,7 @@
|
||||
@@ -1983,7 +_,7 @@
|
||||
}
|
||||
|
||||
public String getServerModName() {
|
||||
|
||||
Reference in New Issue
Block a user