Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fdd910e Log IOException in plugin update (#7960)
PaperMC/Paper@90836d0 1.19 Anti-Xray cleanup (#8104)
PaperMC/Paper@384d639 Fix missing redstone event call with Eigencraft redstone (#8148)
This commit is contained in:
BillyGalbreath
2022-07-18 06:49:45 -05:00
parent b5fd0447a9
commit 4951792417
7 changed files with 30 additions and 30 deletions

View File

@@ -27,10 +27,10 @@ index 73f1211470d9626c82c8345037da19aed9db3f23..40c7bf266eccc43faa081ade9402bee5
return true;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 7e9e1fd5eb9f44c80d180534cd1211e8754b3afd..072c72385c2ec279d03daed003a992b381178fbb 100644
index a1d9994c39e19a942b0bc605bed1413498e6df16..765653976492ff63b325f0538b2fdd579a9e0019 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1571,4 +1571,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1570,4 +1570,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return null;
}
// Paper end
@@ -68,7 +68,7 @@ index 0afadbc8515d448b0ef817f4f0f53b1bb0abde43..c9daa26ab987249f390c64c9e26cd9ce
} else {
world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index e49c2c16f6130eb1343d49d5a3972f505155aba2..e63ae0cd672f162566c8edad0b2376cab907898a 100644
index 8514b53b94893c576fa814af58c756e16cf5c730..e3ad7c379e62c3b77c4e43f59ff8747044438b78 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -237,6 +237,11 @@ public class PurpurConfig {