Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 15:04:06 +01:00
Code Issues Projects Releases Wiki Activity

Sync Starlight SaveUtil with 1.1.1

Browse Source 
Code isn't used, but still should be synced
This commit is contained in:
Spottedleaf 2022-06-18 14:48:08 -07:00
parent b0eb4e0c74
commit 9797f081c2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0791-Rewrite-the-light-engine.patch
View File

@ -4108,10 +4108,10 @@ index 0000000000000000000000000000000000000000..177d0a969f3d72a34e773e8309c3719a
+} +}
diff --git a/src/main/java/ca/spottedleaf/starlight/common/util/SaveUtil.java b/src/main/java/ca/spottedleaf/starlight/common/util/SaveUtil.java diff --git a/src/main/java/ca/spottedleaf/starlight/common/util/SaveUtil.java b/src/main/java/ca/spottedleaf/starlight/common/util/SaveUtil.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..9892863af9f94ab8e378652df2a7ccfebb8c7f41 index 0000000000000000000000000000000000000000..6df9e01731d7fcbe279736b8fc18396595b95574
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/starlight/common/util/SaveUtil.java +++ b/src/main/java/ca/spottedleaf/starlight/common/util/SaveUtil.java
@@ -0,0 +1,187 @@ @@ -0,0 +1,192 @@
+package ca.spottedleaf.starlight.common.util; +package ca.spottedleaf.starlight.common.util;
+ +
+import ca.spottedleaf.starlight.common.light.SWMRNibbleArray; +import ca.spottedleaf.starlight.common.light.SWMRNibbleArray;
@ -4143,9 +4143,12 @@ index 0000000000000000000000000000000000000000..9892863af9f94ab8e378652df2a7ccfe
+ public static void saveLightHook(final Level world, final ChunkAccess chunk, final CompoundTag nbt) { + public static void saveLightHook(final Level world, final ChunkAccess chunk, final CompoundTag nbt) {
+ try { + try {
+ saveLightHookReal(world, chunk, nbt); + saveLightHookReal(world, chunk, nbt);
+ } catch (final Exception ex) { + } catch (final Throwable ex) {
+ // failing to inject is not fatal so we catch anything here. if it fails, it will have correctly set lit to false + // failing to inject is not fatal so we catch anything here. if it fails, it will have correctly set lit to false
+ // for Vanilla to relight on load and it will not set our lit tag so we will relight on load + // for Vanilla to relight on load and it will not set our lit tag so we will relight on load
+ if (ex instanceof ThreadDeath) {
+ throw (ThreadDeath)ex;
+ }
+ LOGGER.warn("Failed to inject light data into save data for chunk " + chunk.getPos() + ", chunk light will be recalculated on its next load", ex); + LOGGER.warn("Failed to inject light data into save data for chunk " + chunk.getPos() + ", chunk light will be recalculated on its next load", ex);
+ } + }
+ } + }
@ -4237,9 +4240,12 @@ index 0000000000000000000000000000000000000000..9892863af9f94ab8e378652df2a7ccfe
+ public static void loadLightHook(final Level world, final ChunkPos pos, final CompoundTag tag, final ChunkAccess into) { + public static void loadLightHook(final Level world, final ChunkPos pos, final CompoundTag tag, final ChunkAccess into) {
+ try { + try {
+ loadLightHookReal(world, pos, tag, into); + loadLightHookReal(world, pos, tag, into);
+ } catch (final Exception ex) { + } catch (final Throwable ex) {
+ // failing to inject is not fatal so we catch anything here. if it fails, then we simply relight. Not a problem, we get correct + // failing to inject is not fatal so we catch anything here. if it fails, then we simply relight. Not a problem, we get correct
+ // lighting in both cases. + // lighting in both cases.
+ if (ex instanceof ThreadDeath) {
+ throw (ThreadDeath)ex;
+ }
+ LOGGER.warn("Failed to load light for chunk " + pos + ", light will be recalculated", ex); + LOGGER.warn("Failed to load light for chunk " + pos + ", light will be recalculated", ex);
+ } + }
+ } + }
@ -4297,7 +4303,6 @@ index 0000000000000000000000000000000000000000..9892863af9f94ab8e378652df2a7ccfe
+ } + }
+ +
+ private SaveUtil() {} + private SaveUtil() {}
+
+} +}
diff --git a/src/main/java/ca/spottedleaf/starlight/common/util/WorldUtil.java b/src/main/java/ca/spottedleaf/starlight/common/util/WorldUtil.java diff --git a/src/main/java/ca/spottedleaf/starlight/common/util/WorldUtil.java b/src/main/java/ca/spottedleaf/starlight/common/util/WorldUtil.java
new file mode 100644 new file mode 100644