Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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@83a1304 [ci skip] Update Gradle wrapper to 8.0.1 (#8924)
PaperMC/Paper@08e6622 fix runServer tasks
PaperMC/Paper@4ae202e Fix getBlockStateIfLoaded world bounds check
PaperMC/Paper@b670798 Close plugin jar file on classloader close and after retrieving name for updating (#8902)
PaperMC/Paper@5170d6f Update the flag when a captured block state is outdated (#8860)
PaperMC/Paper@dead691 Fix MC-157464 Prevent sleeping villagers moving towards food (#8923)
PaperMC/Paper@f408c25 Log message if plugin bootstrap provided external plugin instead of throwing an exception (#8914)
This commit is contained in:
granny
2023-02-28 05:54:09 -08:00
parent afcd5b6f10
commit c5f1057812
10 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0279-Remove-Mojang-Profiler.patch
View File

@@ -1700,10 +1700,10 @@ index a213f4098859858a73ddd601bbe8c7511972e0d5..c0d39afe5b80159ed9aaca4ddd4763d7
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 8a9269c207c6b39d440d213679c31878bc689735..a9289072b048095330ea32d7c965e8dda61a36fc 100644
index 50c8910bca0bbf4177ed30985461fcd2f0ce82ea..fef709fce7309795b6d62d33a220a2be2399efd3 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -711,9 +711,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -713,9 +713,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
BlockState iblockdata2 = this.getBlockState(pos);
if ((flags & 128) == 0 && iblockdata2 != iblockdata1 && (iblockdata2.getLightBlock(this, pos) != iblockdata1.getLightBlock(this, pos) || iblockdata2.getLightEmission() != iblockdata1.getLightEmission() || iblockdata2.useShapeForLightOcclusion() || iblockdata1.useShapeForLightOcclusion())) {
@@ -1715,7 +1715,7 @@ index 8a9269c207c6b39d440d213679c31878bc689735..a9289072b048095330ea32d7c965e8dd
}
/*
@@ -1012,9 +1012,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1014,9 +1014,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
protected void tickBlockEntities() {
@@ -1727,7 +1727,7 @@ index 8a9269c207c6b39d440d213679c31878bc689735..a9289072b048095330ea32d7c965e8dd
//timings.tileEntityPending.startTiming(); // Spigot // Purpur
this.tickingBlockEntities = true;
if (!this.pendingBlockEntityTickers.isEmpty()) {
@@ -1059,7 +1059,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1061,7 +1061,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
//timings.tileEntityTick.stopTiming(); // Spigot // Purpur
this.tickingBlockEntities = false;
co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1736,7 +1736,7 @@ index 8a9269c207c6b39d440d213679c31878bc689735..a9289072b048095330ea32d7c965e8dd
spigotConfig.currentPrimedTnt = 0; // Spigot
}
@@ -1252,7 +1252,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1254,7 +1254,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@Override
public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1745,7 +1745,7 @@ index 8a9269c207c6b39d440d213679c31878bc689735..a9289072b048095330ea32d7c965e8dd
List<Entity> list = Lists.newArrayList();
((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
return list;
@@ -1271,7 +1271,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1273,7 +1273,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1754,7 +1754,7 @@ index 8a9269c207c6b39d440d213679c31878bc689735..a9289072b048095330ea32d7c965e8dd
// Paper start - optimise this call
//TODO use limit
if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
@@ -1600,7 +1600,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1602,7 +1602,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {