Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c6d7375 use BlockFormEvent for mud converting into clay (#8398)
PaperMC/Paper@14c32bc Fix wrong yaw and pitch of CommandSourceStack#getBukkitLocation (#8411)
PaperMC/Paper@f5fa691 Don't print full packages in new chunk system classes
This commit is contained in:
BillyGalbreath 2022-09-30 17:04:11 -05:00
parent c0cbab8836
commit 955bd91c2b
No known key found for this signature in database
GPG Key ID: 1968A5C4D57BB3FA
3 changed files with 1 additions and 25 deletions

View File

@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT
paperCommit = 8d69cfc6ce1e1d8499a0eab91fc89320c690da69
paperCommit = f5fa69173cb59bf9fb4420163a25e305c7218b6b
org.gradle.caching = true
org.gradle.parallel = true

View File

@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Wed, 28 Sep 2022 13:51:41 -0500
Subject: [PATCH] Use simple class names in Paper loggers
diff --git a/src/main/java/com/mojang/logging/LogUtils.java b/src/main/java/com/mojang/logging/LogUtils.java
index 46cab7a8c7b87ab01b26074b04f5a02b3907cfc4..f7449f6ec04356175a0349001a6daa27ab5873f1 100644
--- a/src/main/java/com/mojang/logging/LogUtils.java
+++ b/src/main/java/com/mojang/logging/LogUtils.java
@@ -59,6 +59,12 @@ public class LogUtils {
* Caller sensitive, DO NOT WRAP
*/
public static Logger getLogger() {
- return LoggerFactory.getLogger(STACK_WALKER.getCallerClass());
+ // Purpur start
+ Class<?> clazz = STACK_WALKER.getCallerClass();
+ if (clazz.getPackageName().startsWith("io.papermc.paper")) {
+ return LoggerFactory.getLogger(clazz.getSimpleName());
+ }
+ return LoggerFactory.getLogger(clazz);
+ // Purpur end
}
}