mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-29 03:49:21 +00:00
63 lines
4.2 KiB
Diff
63 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Thu, 16 Sep 2021 20:39:45 -0400
|
|
Subject: [PATCH] Rebrand
|
|
|
|
|
|
diff --git a/net/minecraft/CrashReport.java b/net/minecraft/CrashReport.java
|
|
index 3e0e88afcf010d9a3d46e48bca5cbdf98fe97544..5a9173b6039ee8404529a04904c5f9e9343d74d8 100644
|
|
--- a/net/minecraft/CrashReport.java
|
|
+++ b/net/minecraft/CrashReport.java
|
|
@@ -30,6 +30,7 @@ public class CrashReport {
|
|
private boolean trackingStackTrace = true;
|
|
private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
|
|
private final SystemReport systemReport = new SystemReport();
|
|
+ private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER OR GALE! REPORT TO LEAF INSTEAD!", ""); // Leaf - Rebrand
|
|
|
|
public CrashReport(String title, Throwable exception) {
|
|
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
|
|
@@ -130,7 +131,7 @@ public class CrashReport {
|
|
}
|
|
|
|
public String getFriendlyReport(ReportType type) {
|
|
- return this.getFriendlyReport(type, List.of());
|
|
+ return this.getFriendlyReport(type, extraInfo); // Leaf - Rebrand
|
|
}
|
|
|
|
@Nullable
|
|
@@ -161,7 +162,7 @@ public class CrashReport {
|
|
}
|
|
|
|
public boolean saveToFile(Path path, ReportType type) {
|
|
- return this.saveToFile(path, type, List.of());
|
|
+ return this.saveToFile(path, type, extraInfo); // Leaf - Rebrand
|
|
}
|
|
|
|
public SystemReport getSystemReport() {
|
|
diff --git a/net/minecraft/world/damagesource/DamageSource.java b/net/minecraft/world/damagesource/DamageSource.java
|
|
index aea139e47a0866c63c0fc6728840e5ad92a26403..ac7352a2b264abf4db4b89f39a2c86f390776336 100644
|
|
--- a/net/minecraft/world/damagesource/DamageSource.java
|
|
+++ b/net/minecraft/world/damagesource/DamageSource.java
|
|
@@ -66,7 +66,7 @@ public class DamageSource {
|
|
|
|
public DamageSource customEventDamager(Entity entity) {
|
|
if (this.directEntity != null) {
|
|
- throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to Paper, if you think this is a Gale bug, please report it at https://github.com/GaleMC/Gale/issues)"); // Gale - branding changes
|
|
+ throw new IllegalStateException("Cannot set custom event damager when direct entity is already set (report a bug to Paper, if you think this is a Leaf bug, please report it at https://github.com/Winds-Studio/Leaf/issues)"); // Gale - branding changes // Leaf - Rebrand
|
|
}
|
|
DamageSource damageSource = this.cloneInstance();
|
|
damageSource.customEventDamager = entity;
|
|
diff --git a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
index 3abb8aefcca325e28f0af07bd859be74f0aee08d..320e9e24711d2a326313b3a202c7ef987f71f229 100644
|
|
--- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
+++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
@@ -288,7 +288,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
We do not want people to report thread issues to Paper,
|
|
but we do want people to report thread issues to Gale.
|
|
*/
|
|
- org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER OR GALE - You may ask for help on Discord, but do not file an issue. These error messages can not be removed. - If you think this is a Gale bug, please report it at https://github.com/GaleMC/Gale/issues)");
|
|
+ org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER OR LEAF - You may ask for help on Discord, but do not file an issue. These error messages can not be removed. - If you think this is a Leaf bug, please report it at https://github.com/Winds-Studio/Leaf/issues)"); // Leaf - Rebrand
|
|
// Gale end - branding changes
|
|
}
|
|
|