Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@41bc31b Update paperweight to 1.7.3 (#11445)
PaperMC/Paper@e17eb6b Improve entity effect API (#11444)
PaperMC/Paper@7b03141 Add startingBrewTime (#11406)
PaperMC/Paper@355b1cb Add API for explosions to damage the explosion cause (#11180)
PaperMC/Paper@6d7a438 Call bucket events for cauldrons (#7486)
This commit is contained in:
granny
2024-09-29 00:15:17 -07:00
parent 501e7c5124
commit 2a50638047
25 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0254-Remove-Mojang-Profiler.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index a66e2d78722847dec4e9d4aba8e6968ef009fcf4..24cb04cd33cfe578286c85a892b20bbf3fc843e6 100644
index 929835b74d539bb0af1bb99f23b50b79f457594e..7e0a05608a205ab81b3597dd3a9b5d4446d92fec 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -165,7 +165,7 @@ public class Commands {
@@ -593,7 +593,7 @@ index 793f16cb4049d121a6ef7ca4fcd9519dc8c0a7b0..ebe872c4643038f0c99b289d4d5afdbe
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index c3699c7dcc2c94215d6601c7c07669c37f1fa4ab..c601061d1abb8f4a66dd5e478cf69a872a4d0f6f 100644
index b6fd5b83cff5ea21221d029b8729932e25300d47..067b10134b087626e05596225744b905211e8b63 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -645,16 +645,16 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1784,10 +1784,10 @@ index 4af1857c4fbc18067b2fa0ae43501ce540630c6f..d58f845dc814011b8126cc641476b6e4
this.assignProfessionWhenSpawned = false;
}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index ad57bf49476192dea6a7367cbd0ad3f11e142e1b..07d480540c2c095e13de214cdf6866387d54837f 100644
index f696afd7e241bf1966a2d505b5d59bff824b43e4..6395bd2ffd734ca73af17b003d1505971ea31a48 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -646,7 +646,7 @@ public class Explosion {
@@ -647,7 +647,7 @@ public class Explosion {
}
if (flag1) {
@@ -1796,7 +1796,7 @@ index ad57bf49476192dea6a7367cbd0ad3f11e142e1b..07d480540c2c095e13de214cdf686638
List<Pair<ItemStack, BlockPos>> list = new ArrayList();
Util.shuffle(this.toBlow, this.level.random);
@@ -721,7 +721,7 @@ public class Explosion {
@@ -722,7 +722,7 @@ public class Explosion {
Block.popResource(this.level, (BlockPos) pair.getSecond(), (ItemStack) pair.getFirst());
}
@@ -1806,7 +1806,7 @@ index ad57bf49476192dea6a7367cbd0ad3f11e142e1b..07d480540c2c095e13de214cdf686638
if (this.fire) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index e7642c30833d1efd159cd15429e1247022cfd511..26fbc981ec9acafc7ba1753759375c142261b6ab 100644
index ccc6204141298deea56d996fab24254d25857da5..5057d9d433ba002a22d22adfaf7323b2cfaee9af 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -269,7 +269,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1848,7 +1848,7 @@ index e7642c30833d1efd159cd15429e1247022cfd511..26fbc981ec9acafc7ba1753759375c14
this.spigotConfig.currentPrimedTnt = 0; // Spigot
}
@@ -1669,7 +1669,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1686,7 +1686,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@Override
public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1857,7 +1857,7 @@ index e7642c30833d1efd159cd15429e1247022cfd511..26fbc981ec9acafc7ba1753759375c14
// Paper start - rewrite chunk system
final List<Entity> ret = new java.util.ArrayList<>();
@@ -1695,7 +1695,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1712,7 +1712,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
public <T extends Entity> void getEntities(final EntityTypeTest<Entity, T> entityTypeTest,
final AABB boundingBox, final Predicate<? super T> predicate,
final List<? super T> into, final int maxCount) {
@@ -1866,7 +1866,7 @@ index e7642c30833d1efd159cd15429e1247022cfd511..26fbc981ec9acafc7ba1753759375c14
if (entityTypeTest instanceof net.minecraft.world.entity.EntityType<T> byType) {
if (maxCount != Integer.MAX_VALUE) {
@@ -1990,7 +1990,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -2007,7 +2007,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
}
public ProfilerFiller getProfiler() {