Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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

8
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a1853f3d988820f357c11371e32d50682e60401..d9ace6cd8e9cbf088e6664469fb94df0c964998f 100644
index 4cc7d15f43b2547a723ea231bcf98bc13bdb85bf..af8a561e4d59d98ebb6d7a8fbcb072e361b10058 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@@ -2840,7 +2840,7 @@ index 663c1d8c1611af915a1bae733920dd75ad73feb1..c15e4d95baacd30f9614dc5526dc8fc1
final String id;
private final GameRules.Category category;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 3cbf801b2e5420c0e870f73788deb550e49ad54d..edd2c236ca7c37e1a3aec0048b8974f4cd62f2cc 100644
index db971ca4136c7f922d630f38aa5c78cb04adbdfa..eb0a31c885ea64da00abcd5e67083392138b1ca0 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -270,6 +270,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -2967,7 +2967,7 @@ index 3cbf801b2e5420c0e870f73788deb550e49ad54d..edd2c236ca7c37e1a3aec0048b8974f4
public boolean isInWorldBounds(BlockPos pos) {
return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
}
@@ -917,13 +1020,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -919,13 +1022,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
try {
tickConsumer.accept(entity);
MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -2983,7 +2983,7 @@ index 3cbf801b2e5420c0e870f73788deb550e49ad54d..edd2c236ca7c37e1a3aec0048b8974f4
// Paper end
}
}
@@ -1450,6 +1553,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1452,6 +1555,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {